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/network.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mdk-stage1/network.c') diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index 6ea2b97b7..d47a39650 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -967,7 +967,7 @@ enum return_type ftp_prepare(void) results = RETURN_BACK; continue; } - kernels_list_file = asprintf_("%s/" RAMDISK_LOCATION_REL "mdkinst.kernels", location_full); + kernels_list_file = asprintf_("%s/" CLP_LOCATION_REL "mdkinst.kernels", location_full); log_message("FTP: trying to retrieve %s", kernels_list_file); fd = ftp_start_download(ftp_serv_response, kernels_list_file, &size); @@ -992,7 +992,7 @@ enum return_type ftp_prepare(void) } } - strcat(location_full, get_ramdisk_realname()); + strcat(location_full, CLP_FILE_REL("/")); log_message("FTP: trying to retrieve %s", location_full); @@ -1021,7 +1021,7 @@ enum return_type ftp_prepare(void) log_message("FTP: size of download %d bytes", size); - results = load_ramdisk_fd(fd, size); + results = load_clp_fd(fd, size); if (results == RETURN_OK) { if (!use_http_proxy) ftp_end_data_command(ftp_serv_response); @@ -1087,7 +1087,7 @@ enum return_type http_prepare(void) strcpy(location_full, answers[1][0] == '/' ? "" : "/"); strcat(location_full, answers[1]); - strcat(location_full, get_ramdisk_realname()); + strcat(location_full, CLP_FILE_REL("/")); log_message("HTTP: trying to retrieve %s from %s", location_full, answers[0]); @@ -1106,7 +1106,7 @@ enum return_type http_prepare(void) log_message("HTTP: size of download %d bytes", size); - if (load_ramdisk_fd(fd, size) != RETURN_OK) { + if (load_clp_fd(fd, size) != RETURN_OK) { unset_param(MODE_AUTOMATIC); /* we are in a fallback mode */ return RETURN_ERROR; } -- cgit v1.2.1