[src/trunk]: src/sys/arch/i386/stand Do not use default entry's parameters fo...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7193b410f48b
branches:  trunk
changeset: 366692:7193b410f48b
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Jun 08 21:43:45 2022 +0000

description:
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@

diffstat:

 sys/arch/i386/stand/boot/boot2.c   |  6 +-----
 sys/arch/i386/stand/efiboot/boot.c |  4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diffs (38 lines):

diff -r 7ebab9fe365e -r 7193b410f48b sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Wed Jun 08 19:47:10 2022 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Wed Jun 08 21:43:45 2022 +0000
@@ -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 @@
        } 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);
diff -r 7ebab9fe365e -r 7193b410f48b sys/arch/i386/stand/efiboot/boot.c
--- a/sys/arch/i386/stand/efiboot/boot.c        Wed Jun 08 19:47:10 2022 +0000
+++ b/sys/arch/i386/stand/efiboot/boot.c        Wed Jun 08 21:43:45 2022 +0000
@@ -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 <nonaka%netbsd.org@localhost>
@@ -453,8 +453,6 @@
        } else {
                int i;
 
-               if (howto == 0)
-                       bootdefault();
                for (i = 0; i < NUMNAMES; i++) {
                        bootit(names[i][0], howto);
                        bootit(names[i][1], howto);