summaryrefslogtreecommitdiff
path: root/serverboot/bootstrap.c
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-10-08 13:40:13 +0000
committerThomas Bushnell <thomas@gnu.org>1999-10-08 13:40:13 +0000
commit4bce0bcdcf2513a399cecbfe5e7ae295af61af4e (patch)
treea21498c80197ee9795d911e717176f118a55282f /serverboot/bootstrap.c
parentfbaaf6ed6e97c7900e3fe09ce664a2437b4fd61b (diff)
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. Don't use strcpy to move NEW_ROOT into ROOT_NAME; that's unsafe.
Diffstat (limited to 'serverboot/bootstrap.c')
-rw-r--r--serverboot/bootstrap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/serverboot/bootstrap.c b/serverboot/bootstrap.c
index 69e4f892..f6d6050a 100644
--- a/serverboot/bootstrap.c
+++ b/serverboot/bootstrap.c
@@ -237,14 +237,14 @@ main(argc, argv)
* root device was specificed, ask for the root device.
*/
- if (root_name [0] == '\0' || index(flag_string, 'a')) {
+ if (!root_name || root_name [0] == '\0' || index(flag_string, 'a')) {
static char new_root[16];
-
+
printf("root device? [%s] ", root_name);
safe_gets(new_root, sizeof(new_root));
if (new_root[0] != '\0')
- strcpy (root_name, new_root);
+ root_name = new_root;
}
(void) strbuild(boot_script_name,