summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-09-11 10:04:45 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-09-11 10:04:45 +0000
commitd844c790298fca40269cb2e4fd702482b5e728a8 (patch)
treeffc0e09e6edbdcbd7e01d152ed3066e2c10bb1a8
parent60e9475da34d156525ca41695a9f89e00641f38a (diff)
downloaddrakx-d844c790298fca40269cb2e4fd702482b5e728a8.tar
drakx-d844c790298fca40269cb2e4fd702482b5e728a8.tar.gz
drakx-d844c790298fca40269cb2e4fd702482b5e728a8.tar.bz2
drakx-d844c790298fca40269cb2e4fd702482b5e728a8.tar.xz
drakx-d844c790298fca40269cb2e4fd702482b5e728a8.zip
fix recovery behaviour thx to francois comments
-rw-r--r--mdk-stage1/disk.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 32f312862..a5bc8de4b 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -414,22 +414,18 @@ process_recovery(void)
goto examine_next_part;
}
strcpy(location, disk_own_mount);
- strcat(location, "/Mandrake/oem_patch.pl");
+ strcat(location, "/Mandrake/base");
if (access(location, R_OK)) {
- log_message("Mandrake/oem_patch.pl is not here");
+ log_message("Mandrake/base is not here");
goto examine_next_part;
}
log_message("going on with a recovery on disk %s partition %s", medias[i], *part);
symlink(disk_own_mount, IMAGE_LOCATION);
- if (load_ramdisk() != RETURN_OK) {
- log_perror("loading ramdisk failed");
- umount(disk_own_mount);
- return 0;
- }
-
- umount(disk_own_mount);
+ if (ramdisk_possible())
+ load_ramdisk(); /* if load of ramdisk failed, try to continue in live */
+
method_name = strdup("disk");
return 1;
}