mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

biosboot compatibility fix:

Browse Source 
If we have a boot.config command, display it.
This commit is contained in:
Robert Nordier 1998-10-17 09:16:01 +00:00
parent 7fa25d805a
commit 3044a22097
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=40472
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/boot/i386/boot2/boot2.c
View File

@ -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)) {

11
sys/boot/i386/gptboot/gptboot.c
View File

@ -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)) {