From 051fc6fab1adde3e296a69584bb9bb6b6bc5d71b Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 12 Mar 1997 18:48:31 +0000 Subject: [PATCH] Fixed setting of default kernel name when there is no boot.config file. Didn't fix a more serious problem when boot.config is empty - read() can't handle empty files. Reported by: Chris Timmons --- sys/i386/boot/biosboot/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index d9a34423216b..2f9fe667289a 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * 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; } else #endif /*NAMEBLOCK*/ - name = "kernel"; readfile("boot.config", boot_config, BOOT_CONFIG_SIZE); - getbootdev(boot_config, &loadflags); if (namebuf[0] != '\0') printf("boot.config: %s", boot_config); + name = "kernel"; + getbootdev(boot_config, &loadflags); /* * XXX parsing of `name' is in openrd(), so the defaults aren't * updated to match the config (if any) before printing the prompt.