diff options
| author | rnordier <rnordier@FreeBSD.org> | 1998-10-17 09:01:13 +0000 |
|---|---|---|
| committer | rnordier <rnordier@FreeBSD.org> | 1998-10-17 09:01:13 +0000 |
| commit | ebcd17d6c6dec37043259b1fe943b379c0334152 (patch) | |
| tree | 8aa2a881398bc72518d8c7bd8f95184b34023ff6 /sys/boot/i386/gptboot | |
| parent | 1849cbd4d1acf75dccf1e1219cc03ef2e53df578 (diff) | |
| download | FreeBSD-src-ebcd17d6c6dec37043259b1fe943b379c0334152.zip FreeBSD-src-ebcd17d6c6dec37043259b1fe943b379c0334152.tar.gz | |
biosboot compatibility fix:
Read boot.help before parsing boot.config. We were parsing
boot.config first, which could result in boot.help being read
from a different location (or not found), which would probably
just cause surprise, without being useful.
Diffstat (limited to 'sys/boot/i386/gptboot')
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index bf9ed8c..812ba92 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -14,7 +14,7 @@ */ /* - * $Id: boot2.c,v 1.6 1998/10/13 23:43:38 rnordier Exp $ + * $Id: boot2.c,v 1.7 1998/10/15 20:04:21 rnordier Exp $ */ #include <sys/param.h> @@ -155,6 +155,7 @@ main(void) bootinfo.bi_bios_geom[i] = drvinfo(i); autoboot = 2; helpon = 1; + readfile(PATH_HELP, help, sizeof(help)); readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (parse(cmd)) autoboot = 0; @@ -169,7 +170,6 @@ main(void) if (autoboot == 1) memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } - readfile(PATH_HELP, help, sizeof(help)); for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" |
