diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 09:27:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 09:27:18 +0000 |
| commit | 755e390a3e193a7c899db5a9e773cf403db31f50 (patch) | |
| tree | a09451bf815883687aababfab0ba5a9213524711 /mdk-stage1/cdrom.c | |
| parent | 12632bab895e9cd68493f120f44dbbfa6e3ab29f (diff) | |
| download | drakx-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/cdrom.c')
| -rw-r--r-- | mdk-stage1/cdrom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index acb202628..f226020c4 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -65,8 +65,7 @@ static enum return_type do_with_device(char * dev_name, char * dev_model) log_message("found a " DISTRIB_NAME " CDROM, good news!"); #ifndef MANDRAKE_MOVE - if (IS_RESCUE || ramdisk_possible()) - load_ramdisk(); /* we don't care about return code, we'll do it live if we failed */ + may_load_clp(); if (IS_RESCUE) /* in rescue mode, we don't need the media anymore */ |