[src/netbsd-7]: src/sys/arch/i386/stand/boot Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/edaf925ff67e
branches:  netbsd-7
changeset: 798851:edaf925ff67e
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 17 12:01:37 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #426):
        sys/arch/i386/stand/boot/boot2.c: revision 1.64
Restore previous behavior: "boot -s" == "boot netbsd -s"
Instead of ignoring the flags and doing the default boot. Merge some
extraneous code.

diffstat:

 sys/arch/i386/stand/boot/boot2.c |  34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diffs (82 lines):

diff -r 5e3ab596df8d -r edaf925ff67e sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Sat Jan 17 11:51:33 2015 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Sat Jan 17 12:01:37 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.63 2014/06/28 09:16:18 rtr Exp $   */
+/*     $NetBSD: boot2.c,v 1.63.2.1 2015/01/17 12:01:37 martin Exp $    */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
 static const char *default_filename;
 
 char *sprint_bootsel(const char *);
-void bootit(const char *, int, int);
+static void bootit(const char *, int);
 void print_banner(void);
 void boot2(int, uint64_t);
 
@@ -244,16 +244,12 @@
                clear_pc_screen();
 }
 
-void
-bootit(const char *filename, int howto, int tell)
+static void
+bootit(const char *filename, int howto)
 {
-
-       if (tell) {
-               printf("booting %s", sprint_bootsel(filename));
-               if (howto)
-                       printf(" (howto 0x%x)", howto);
-               printf("\n");
-       }
+       if (howto & AB_VERBOSE)
+               printf("booting %s (howto 0x%x)\n", sprint_bootsel(filename),
+                   howto);
 
        if (exec_netbsd(filename, 0, howto, boot_biosdev < 0x80, clearit) < 0)
                printf("boot: %s: %s\n", sprint_bootsel(filename),
@@ -389,9 +385,9 @@
                 * try pairs of names[] entries, foo and foo.gz
                 */
                /* don't print "booting..." again */
-               bootit(names[currname][0], 0, 0);
+               bootit(names[currname][0], 0);
                /* since it failed, try compressed bootfile. */
-               bootit(names[currname][1], 0, 1);
+               bootit(names[currname][1], AB_VERBOSE);
        }
 
        bootmenu();     /* does not return */
@@ -451,23 +447,23 @@
 command_boot(char *arg)
 {
        char *filename;
-       int howto, tell;
+       int howto;
 
        if (!parseboot(arg, &filename, &howto))
                return;
 
-       tell = ((howto & AB_VERBOSE) != 0);
        if (filename != NULL) {
-               bootit(filename, howto, tell);
+               bootit(filename, howto);
        } else {
                int i;
 
 #ifndef SMALL
-               bootdefault();
+               if (howto == 0)
+                       bootdefault();
 #endif
                for (i = 0; i < NUMNAMES; i++) {
-                       bootit(names[i][0], howto, tell);
-                       bootit(names[i][1], howto, tell);
+                       bootit(names[i][0], howto);
+                       bootit(names[i][1], howto);
                }
        }
 }