diff options
author | jhb <jhb@FreeBSD.org> | 2005-05-27 19:26:11 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2005-05-27 19:26:11 +0000 |
commit | 3c2fee413700cfbeb07182ccb4327ed76c1885a9 (patch) | |
tree | 7db596ff186c470275bfa60d855aa4910a6055b8 /sys/boot | |
parent | 311d5e11823c8823274a07b206bb11984a17171a (diff) | |
download | FreeBSD-src-3c2fee413700cfbeb07182ccb4327ed76c1885a9.zip FreeBSD-src-3c2fee413700cfbeb07182ccb4327ed76c1885a9.tar.gz |
Print out the commands from /boot.config after parsing them so that they
output is sent to the correct console(s).
PR: kern/66425
Submitted by: Gavin Atkinson gavin at ury dot york dot ac dot uk
MFC after: 1 week
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/i386/boot2/boot2.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 2 | ||||
-rw-r--r-- | sys/boot/pc98/boot2/boot.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 8c082ca..6508dd6 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -243,9 +243,9 @@ main(void) fsread(ino, cmd, sizeof(cmd)); if (*cmd) { - printf("%s: %s", PATH_CONFIG, cmd); if (parse()) autoboot = 0; + printf("%s: %s", PATH_CONFIG, cmd); /* Do not process this command twice */ *cmd = 0; } diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 8c082ca..6508dd6 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -243,9 +243,9 @@ main(void) fsread(ino, cmd, sizeof(cmd)); if (*cmd) { - printf("%s: %s", PATH_CONFIG, cmd); if (parse()) autoboot = 0; + printf("%s: %s", PATH_CONFIG, cmd); /* Do not process this command twice */ *cmd = 0; } diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c index fe288c0..feccc7e 100644 --- a/sys/boot/pc98/boot2/boot.c +++ b/sys/boot/pc98/boot2/boot.c @@ -124,8 +124,8 @@ boot(int drive) readfile("boot.config", boot_config, BOOT_CONFIG_SIZE); name = "/boot/loader"; if (boot_config[0] != '\0') { - printf("boot.config: %s", boot_config); getbootdev(boot_config, &loadflags); + printf("boot.config: %s", boot_config); if (openrd() != 0) name = "kernel"; } |