From 755e390a3e193a7c899db5a9e773cf403db31f50 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 16 Nov 2004 09:27:18 +0000 Subject: 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 --- mdk-stage1/config-stage1.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'mdk-stage1/config-stage1.h') diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index df0646855..662ad4fb5 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -20,14 +20,15 @@ /* If we have more than that amount of memory (in Mbytes), we assume we can load the second stage as a ramdisk */ #define MEM_LIMIT_DRAKX 68 +/* If we have more than that amount of memory (in Mbytes), we preload the second stage as a ramdisk */ +#define MEM_LIMIT_DRAKX_PRELOAD 100 /* If we have more than that amount of memory (in Mbytes), we assume we can load the rescue as a ramdisk */ #define MEM_LIMIT_RESCUE 40 +/* If we have more than that amount of memory (in Mbytes), we preload the rescue as a ramdisk */ +#define MEM_LIMIT_RESCUE_PRELOAD 100 -#define RAMDISK_COMPRESSION_RATIO 1.95 - -#define RAMDISK_LOCATION_REL "install/stage2/" #define SLASH_LOCATION "/sysroot" #ifdef MANDRAKE_MOVE @@ -53,6 +54,11 @@ #define DISTRIB_NAME "Mandrakelinux" #define LIVE_LOCATION_REL "install/stage2/live/" +#define CLP_LOCATION_REL "install/stage2/" +#define CLP_STAGE2_NAME "mdkinst.clp" +#define CLP_RESCUE_NAME "rescue.clp" +#define CLP_NAME(prefix) (IS_RESCUE ? prefix CLP_RESCUE_NAME : prefix CLP_STAGE2_NAME) +#define CLP_FILE_REL(prefix) CLP_NAME(prefix CLP_LOCATION_REL) /* the remote media is mounted in - IMAGE_LOCATION_DIR "nfsimage", and IMAGE_LOCATION is a symlink image -> nfsimage/mdk/mirror/dir @@ -63,6 +69,11 @@ #define IMAGE_LOCATION_REL "image" #define IMAGE_LOCATION IMAGE_LOCATION_DIR IMAGE_LOCATION_REL +#define CLP_LOCATION IMAGE_LOCATION "/" CLP_LOCATION_REL + +/* - if we use a clp : STAGE2_LOCATION is a the mount point + - if we use the live: STAGE2_LOCATION is a relative symlink to IMAGE_LOCATION_REL/install/stage2/live +*/ #define STAGE2_LOCATION_ROOTED "/tmp/stage2" #define STAGE2_LOCATION SLASH_LOCATION STAGE2_LOCATION_ROOTED -- cgit v1.2.1