CVS commit: src/sys/stand/efiboot

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Wed Apr 10 19:36:04 UTC 2019

Modified Files:
        src/sys/stand/efiboot: boot.c

Log Message:
Print bootargs from the environment

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


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/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/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.15 src/sys/stand/efiboot/boot.c:1.16
--- src/sys/stand/efiboot/boot.c:1.15	Fri Jan 18 19:41:03 2019
+++ src/sys/stand/efiboot/boot.c	Wed Apr 10 19:36:04 2019
@@ -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 <non...@netbsd.org>
@@ -137,6 +137,9 @@ command_boot(char *arg)
 	if (!kernel || !*kernel)
 		kernel = DEFFILENAME;
 
+	if (!*bootargs)
+		bootargs = netbsd_args;
+
 	exec_netbsd(kernel, bootargs);
 }
 
@@ -415,7 +418,8 @@ boot(void)
 	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')