From dfb99727ca2de9328c7b561156749edf850cff25 Mon Sep 17 00:00:00 2001 From: skrll Date: Wed, 10 Apr 2019 19:36:04 +0000 Subject: [PATCH] Print bootargs from the environment Pass the enironment boot args if none are provided by the boot command --- sys/stand/efiboot/boot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/stand/efiboot/boot.c b/sys/stand/efiboot/boot.c index 927e832f907a..b218cb7ac3d0 100644 --- a/sys/stand/efiboot/boot.c +++ b/sys/stand/efiboot/boot.c @@ -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 @@ -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')