summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386/gptboot
diff options
context:
space:
mode:
authorrnordier <rnordier@FreeBSD.org>1998-10-17 09:16:01 +0000
committerrnordier <rnordier@FreeBSD.org>1998-10-17 09:16:01 +0000
commit19b83af2927dac7935f3437f09668e2c107172b6 (patch)
tree9271e947f23c6b698f5d408cd01c0084e304aafb /sys/boot/i386/gptboot
parentebcd17d6c6dec37043259b1fe943b379c0334152 (diff)
downloadFreeBSD-src-19b83af2927dac7935f3437f09668e2c107172b6.zip
FreeBSD-src-19b83af2927dac7935f3437f09668e2c107172b6.tar.gz
biosboot compatibility fix:
If we have a boot.config command, display it.
Diffstat (limited to 'sys/boot/i386/gptboot')
-rw-r--r--sys/boot/i386/gptboot/gptboot.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 812ba92..8c494c0 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -14,7 +14,7 @@
*/
/*
- * $Id: boot2.c,v 1.7 1998/10/15 20:04:21 rnordier Exp $
+ * $Id: boot2.c,v 1.8 1998/10/17 09:01:13 rnordier Exp $
*/
#include <sys/param.h>
@@ -157,9 +157,12 @@ main(void)
helpon = 1;
readfile(PATH_HELP, help, sizeof(help));
readfile(PATH_CONFIG, cmd, sizeof(cmd));
- if (parse(cmd))
- autoboot = 0;
- else if (!*kname) {
+ if (*cmd) {
+ printf("%s: %s", PATH_CONFIG, cmd);
+ if (parse(cmd))
+ autoboot = 0;
+ }
+ if (autoboot && !*kname) {
if (autoboot == 2) {
memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3));
if (!keyhit(0x37)) {
OpenPOWER on IntegriCloud