diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-02-28 11:43:32 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-02-28 11:43:32 +0000 |
commit | 32f10b4a2a80a58f3ef812e3cedcb12f124abf4f (patch) | |
tree | 7175603fbd8ec3be80fc5e9a2e13f09d48f0b07d /rescue/make_rescue_img | |
parent | 4889288e5d2654e6127a9606de81f81da4b282f1 (diff) | |
download | drakx-32f10b4a2a80a58f3ef812e3cedcb12f124abf4f.tar drakx-32f10b4a2a80a58f3ef812e3cedcb12f124abf4f.tar.gz drakx-32f10b4a2a80a58f3ef812e3cedcb12f124abf4f.tar.bz2 drakx-32f10b4a2a80a58f3ef812e3cedcb12f124abf4f.tar.xz drakx-32f10b4a2a80a58f3ef812e3cedcb12f124abf4f.zip |
- in rest_all, try to restore from the cdrom
- remove the debugging setting of leia as the partimage server
Diffstat (limited to 'rescue/make_rescue_img')
-rwxr-xr-x | rescue/make_rescue_img | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 0bf9ba05f..6b79edcf4 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -115,14 +115,18 @@ __ "strip $tmp/{lib,$lib,bin,sbin}/* $tmp/usr/{bin,sbin}/* 2>/dev/null"; if ($ENV{PARTIMAGE_DIR}) { _ "rpm2cpio $ENV{PARTIMAGE_RPM} | (cd $tmp ; cpio -idu ./usr/sbin/partimage)"; my $server = 'partimaged'; - $server = 'leia'; substInFile { $_ = <<EOF if /^\s*rescue-gui/; if grep -q save_all /proc/cmdline; then drvinst ; dhcp-client ; partimage -s $server -b save_all $ENV{PARTIMAGE_DIR}; reboot fi if grep -q rest_all /proc/cmdline; then - drvinst ; dhcp-client ; partimage -s $server -b rest_all $ENV{PARTIMAGE_DIR}; reboot + local=/tmp/image$ENV{PARTIMAGE_DIR} + if [ -d \$local ]; then + partimage -b rest_all \$local; reboot + else + drvinst ; dhcp-client ; partimage -s $server -b rest_all $ENV{PARTIMAGE_DIR}; reboot + fi fi EOF } "$tmp/etc/rc.sysinit"; |