summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/disk.c
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-16 09:27:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-16 09:27:18 +0000
commit755e390a3e193a7c899db5a9e773cf403db31f50 (patch)
treea09451bf815883687aababfab0ba5a9213524711 /mdk-stage1/disk.c
parent12632bab895e9cd68493f120f44dbbfa6e3ab29f (diff)
downloaddrakx-755e390a3e193a7c899db5a9e773cf403db31f50.tar
drakx-755e390a3e193a7c899db5a9e773cf403db31f50.tar.gz
drakx-755e390a3e193a7c899db5a9e773cf403db31f50.tar.bz2
drakx-755e390a3e193a7c899db5a9e773cf403db31f50.tar.xz
drakx-755e390a3e193a7c899db5a9e773cf403db31f50.zip
major switch from ramdisk to clp
- mdkinst_stage2.bz2 is now mdkinst.clp - rescue_stage2.bz2 is now rescue.clp - make_mdkinst_stage2 is now mdkinst_stage2_tool (we don't keep the live when building the clp, mdkinst_stage2_tool is able to create the clp from the live, or the live from the clp) - all stage1 images now need cryptoloop & gzloop - the clp can be preloaded in memory or not (see MEM_LIMIT_DRAKX_PRELOAD and MEM_LIMIT_RESCUE_PRELOAD) (for http & ftp, it *must* be preloaded) - we don't uncompress the ramdisk anymore since the decompression is done on the fly, this makes the rescue boot much faster - function get_ramdisk_realname() is replaced with macro CLP_FILE_REL
Diffstat (limited to 'mdk-stage1/disk.c')
-rw-r--r--mdk-stage1/disk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index c45d38412..1060cd199 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -370,8 +370,7 @@ process_recovery(void)
log_message("going on with a recovery on disk %s partition %s", medias[i], *part);
symlink(disk_own_mount, IMAGE_LOCATION);
- if (ramdisk_possible())
- load_ramdisk(); /* if load of ramdisk failed, try to continue in live */
+ may_load_clp(); /* no error check */
add_to_env("METHOD", "disk");
return 1;