diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-13 08:34:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-13 08:34:50 +0000 |
| commit | e79950d93af06b735b86548120dc60b2c5be6ee0 (patch) | |
| tree | cd0d96ad02a9febbbf7b00071c84d89adf81fdc0 /mdk-stage1/disk.c | |
| parent | 29a2a329574efc2b945de3d9f2dc08803c6dafd9 (diff) | |
| download | drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.gz drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.bz2 drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.tar.xz drakx-e79950d93af06b735b86548120dc60b2c5be6ee0.zip | |
instead of keeping stage1 (mostly as temporary space but with a fixed size, and for the background init),
exit the stage1 giving hand to stage2 in a tmpfs (same as what was done for Mandrakemove)
Diffstat (limited to 'mdk-stage1/disk.c')
| -rw-r--r-- | mdk-stage1/disk.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index 3cd2da6a4..f6694dd68 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -205,11 +205,7 @@ static enum return_type try_with_device(char *dev_name) static char ** answers_location = NULL; char location_full[500]; -#ifndef MANDRAKE_MOVE - char * disk_own_mount = "/tmp/hdimage"; -#else char * disk_own_mount = SLASH_LOCATION "/tmp/hdimage"; -#endif char * loopdev = NULL; char * parts[50]; @@ -235,9 +231,6 @@ static enum return_type try_with_device(char *dev_name) if (results != RETURN_OK) return results; } -#ifdef MANDRAKE_MOVE - mkdir (SLASH_LOCATION "/tmp", 0755); -#endif if (try_mount(choice, disk_own_mount)) { stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, reiserfs)."); @@ -327,7 +320,7 @@ static enum return_type try_with_device(char *dev_name) umount(disk_own_mount); } - method_name = strdup("disk"); + add_to_env("METHOD", "disk"); return RETURN_OK; } @@ -447,7 +440,7 @@ process_recovery(void) if (ramdisk_possible()) load_ramdisk(); /* if load of ramdisk failed, try to continue in live */ - method_name = strdup("disk"); + add_to_env("METHOD", "disk"); return 1; } |