Module Name: src
Committed By: wiz
Date: Wed Jun 8 21:43:45 UTC 2022
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
src/sys/arch/i386/stand/efiboot: boot.c
Log Message:
Do not use default entry's parameters for for plain "boot" command
Go back to the "menu" instead of you want that.
Patch from RVP in PR 56862, ok uwe@
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/stand/efiboot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.78 src/sys/arch/i386/stand/boot/boot2.c:1.79
--- src/sys/arch/i386/stand/boot/boot2.c:1.78 Tue Sep 7 11:41:31 2021
+++ src/sys/arch/i386/stand/boot/boot2.c Wed Jun 8 21:43:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.78 2021/09/07 11:41:31 nia Exp $ */
+/* $NetBSD: boot2.c,v 1.79 2022/06/08 21:43:45 wiz Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -488,10 +488,6 @@ command_boot(char *arg)
} else {
int i;
-#ifndef SMALL
- if (howto == 0)
- bootdefault();
-#endif
for (i = 0; i < NUMNAMES; i++) {
bootit(names[i][0], howto);
bootit(names[i][1], howto);
Index: src/sys/arch/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.20 src/sys/arch/i386/stand/efiboot/boot.c:1.21
--- src/sys/arch/i386/stand/efiboot/boot.c:1.20 Tue Sep 7 11:41:31 2021
+++ src/sys/arch/i386/stand/efiboot/boot.c Wed Jun 8 21:43:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.20 2021/09/07 11:41:31 nia Exp $ */
+/* $NetBSD: boot.c,v 1.21 2022/06/08 21:43:45 wiz Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -453,8 +453,6 @@ command_boot(char *arg)
} else {
int i;
- if (howto == 0)
- bootdefault();
for (i = 0; i < NUMNAMES; i++) {
bootit(names[i][0], howto);
bootit(names[i][1], howto);
