[src/trunk]: src/sys/stand/efiboot Print bootargs from the environment

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

details:   https://anonhg.NetBSD.org/src/rev/027f99a360fd
branches:  trunk
changeset: 450345:027f99a360fd
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Apr 10 19:36:04 2019 +0000

description:
Print bootargs from the environment

Pass the enironment boot args if none are provided by the boot command

diffstat:

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

diffs (29 lines):

diff -r a8d9769ef65c -r 027f99a360fd sys/stand/efiboot/boot.c
--- a/sys/stand/efiboot/boot.c  Wed Apr 10 19:11:42 2019 +0000
+++ b/sys/stand/efiboot/boot.c  Wed Apr 10 19:36:04 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.15 2019/01/18 19:41:03 skrll Exp $  */
+/*     $NetBSD: boot.c,v 1.16 2019/04/10 19:36:04 skrll Exp $  */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -137,6 +137,9 @@
        if (!kernel || !*kernel)
                kernel = DEFFILENAME;
 
+       if (!*bootargs)
+               bootargs = netbsd_args;
+
        exec_netbsd(kernel, bootargs);
 }
 
@@ -415,7 +418,8 @@
        for (; currname < (int)NUMNAMES; currname++) {
                if (currname >= 0)
                        set_bootfile(names[currname]);
-               printf("booting %s - starting in ", netbsd_path);
+               printf("booting %s%s%s - starting in ", netbsd_path,
+                   netbsd_args[0] != '\0' ? " " : "", netbsd_args);
 
                c = awaitkey(DEFTIMEOUT, 1);
                if (c != '\r' && c != '\n' && c != '\0')