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 /rescue/make_rescue_img | |
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 'rescue/make_rescue_img')
-rwxr-xr-x | rescue/make_rescue_img | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 076273f34..7dafd1923 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -6,9 +6,7 @@ use keyboard; $lib = (arch() =~ /x86_64/ ? "lib64" : "lib"); $tmp = "/tmp/rescue_tmp"; -$mnt = "/tmp/rescue_stage2_img"; -$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1"; -$rescue = "rescue_stage2"; +$rescue = "rescue.clp"; if ($>) { $sudo = "sudo"; @@ -114,26 +112,4 @@ __ "strip $tmp/{lib,$lib,bin,sbin}/* $tmp/usr/{bin,sbin}/* 2>/dev/null"; exit 0 if $ARGV[0]; -if (arch() =~ /ppc/) { - #- xfs module on PPC is 4MB! - need room to unpack it - $size = `du -s $tmp | cut -f1` + 4096; #- add 4MB of free space -} else { - $size = `du -s $tmp | cut -f1` + 2048; #- add 2MB of free space -} - -mkdir_p($mnt); -__ "$sudo umount $mnt 2>/dev/null"; - -_ "dd if=/dev/zero of=$rescue bs=1k count=$size"; -_ "$mke2fs $rescue"; -_ "$sudo mount -t ext2 $rescue $mnt -o loop"; -_ "rmdir $mnt/lost+found"; - -_ "$sudo chown -R root.root $tmp"; -_ "$sudo cp -a $tmp/* $mnt"; -_ "$sudo rm -rf $tmp"; - -_ "$sudo umount $mnt"; -_ "rmdir $mnt"; - -_ "bzip2 -f -9 $rescue"; +_ "mkisofs -quiet -D -R $tmp | create_compressed_fs - 65536 $rescue 200 2>/dev/null" |