d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed setting of default kernel name when there is no boot.config file.

Browse Source 
Didn't fix a more serious problem when boot.config is empty - read()
can't handle empty files.

Reported by:	Chris Timmons <skynyrd@opus.cts.cwu.edu>
This commit is contained in:
Bruce Evans 1997-03-12 18:48:31 +00:00
parent 74cf460b66
commit 051fc6fab1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/i386/boot/biosboot/boot.c
View File

@ -24,7 +24,7 @@
* the rights to redistribute these changes. * the rights to redistribute these changes.
* *
* from: Mach, [92/04/03 16:51:14 rvb] * from: Mach, [92/04/03 16:51:14 rvb]
* $Id$ * $Id: boot.c,v 1.63 1997/02/22 09:30:06 peter Exp $
*/ */
@ -154,11 +154,11 @@ boot(int drive)
name = dflt_name; name = dflt_name;
} else } else
#endif /*NAMEBLOCK*/ #endif /*NAMEBLOCK*/
name = "kernel";
readfile("boot.config", boot_config, BOOT_CONFIG_SIZE); readfile("boot.config", boot_config, BOOT_CONFIG_SIZE);
getbootdev(boot_config, &loadflags);
if (namebuf[0] != '\0') if (namebuf[0] != '\0')
printf("boot.config: %s", boot_config); printf("boot.config: %s", boot_config);
name = "kernel";
getbootdev(boot_config, &loadflags);
/* /*
* XXX parsing of `name' is in openrd(), so the defaults aren't * XXX parsing of `name' is in openrd(), so the defaults aren't
* updated to match the config (if any) before printing the prompt. * updated to match the config (if any) before printing the prompt.