diff options
| -rw-r--r-- | serverboot/ChangeLog | 6 | ||||
| -rw-r--r-- | serverboot/bootstrap.c | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/serverboot/ChangeLog b/serverboot/ChangeLog index 10832cb7..3b25fce8 100644 --- a/serverboot/ChangeLog +++ b/serverboot/ChangeLog @@ -1,3 +1,9 @@ +1999-10-08 Thomas Bushnell, BSG <tb@mit.edu> + + * bootstrap.c: (DEFAULT_ROOT): Remove macro. + (main): If no root device was specified, then prompt as if the + user had specified -a. + 1999-10-06 Roland McGrath <roland@baalperazim.frob.com> * bootstrap.c (DEFAULT_ROOT): Change to "hd0s1". diff --git a/serverboot/bootstrap.c b/serverboot/bootstrap.c index ce9e2e10..69e4f892 100644 --- a/serverboot/bootstrap.c +++ b/serverboot/bootstrap.c @@ -37,10 +37,6 @@ #include "../boot/boot_script.h" -/* Use this device if no root specified. */ -#define DEFAULT_ROOT "hd0s1" - - #if 0 /* * Use 8 Kbyte stacks instead of the default 64K. @@ -236,15 +232,12 @@ main(argc, argv) panic_init(bootstrap_master_host_port); #endif - if (root_name[0] == '\0') - root_name = DEFAULT_ROOT; - /* - * If the '-a' (ask) switch was specified, ask for - * the root device. + * If the '-a' (ask) switch was specified, or if no + * root device was specificed, ask for the root device. */ - if (index(flag_string, 'a')) { + if (root_name [0] == '\0' || index(flag_string, 'a')) { static char new_root[16]; printf("root device? [%s] ", root_name); |