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

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

details:   https://anonhg.NetBSD.org/src/rev/4e4a2bd12588
branches:  netbsd-6
changeset: 774421:4e4a2bd12588
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 18:56:54 2012 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #479):
        sys/arch/i386/stand/boot/boot2.c: revision 1.58
Fix i386 `boot' command to try the usual set of kernel names.
Without this, the `boot' command will try only `netbsd', not
`netbsd.gz', `netbsd.old', &c.
Patch from PR port-i386/44562.

diffstat:

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

diffs (34 lines):

diff -r bcba37e1fb31 -r 4e4a2bd12588 sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Sun Aug 12 18:55:10 2012 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Sun Aug 12 18:56:54 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.57 2011/12/25 06:09:09 tsutsui Exp $       */
+/*     $NetBSD: boot2.c,v 1.57.2.1 2012/08/12 18:56:54 martin Exp $    */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -429,10 +429,21 @@
 command_boot(char *arg)
 {
        char *filename;
-       int howto;
+       int howto, tell;
+
+       if (!parseboot(arg, &filename, &howto))
+               return;
 
-       if (parseboot(arg, &filename, &howto))
-               bootit(filename, howto, (howto & AB_VERBOSE) != 0);
+       tell = ((howto & AB_VERBOSE) != 0);
+       if (filename != NULL) {
+               bootit(filename, howto, tell);
+       } else {
+               int i;
+               for (i = 0; i < NUMNAMES; i++) {
+                       bootit(names[i][0], howto, tell);
+                       bootit(names[i][1], howto, tell);
+               }
+       }
 }
 
 void