summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-06-13 13:17:04 +0000
committerOlivier Blin <oblin@mandriva.com>2008-06-13 13:17:04 +0000
commit045cc5c6f4f93f5768f26fce48e0a198ba81837e (patch)
treec85c9ef604d2bcfc90cea27c8396a04e685c39f9
parent385b63be3fa69d662759e5751a7817cca6b7e44d (diff)
downloaddrakx-045cc5c6f4f93f5768f26fce48e0a198ba81837e.tar
drakx-045cc5c6f4f93f5768f26fce48e0a198ba81837e.tar.gz
drakx-045cc5c6f4f93f5768f26fce48e0a198ba81837e.tar.bz2
drakx-045cc5c6f4f93f5768f26fce48e0a198ba81837e.tar.xz
drakx-045cc5c6f4f93f5768f26fce48e0a198ba81837e.zip
drop support for special partimage rpm, changes are merged in the main package
-rwxr-xr-xrescue/make_partimage_save_rest_all5
-rwxr-xr-xrescue/make_rescue_img4
2 files changed, 2 insertions, 7 deletions
diff --git a/rescue/make_partimage_save_rest_all b/rescue/make_partimage_save_rest_all
index 28df39b61..a7af52130 100755
--- a/rescue/make_partimage_save_rest_all
+++ b/rescue/make_partimage_save_rest_all
@@ -1,11 +1,10 @@
#!/bin/sh
[ $# -lt 1 ] && {
- echo "usage: make_partimage_save_rest_all <partimage special rpm> <partimage server> [<partimage dir> <data dirs>]" ;
+ echo "usage: make_partimage_save_rest_all <partimage server> [<partimage dir> <data dirs>]" ;
exit 1
}
-rpm=$1 ; shift
server=$1 ; shift
partimage_dir=$1 ; shift
data_dir=$1 ; shift
@@ -27,7 +26,7 @@ rm -rf .tmp
mkdir -p .tmp/isolinux
cp -f /usr/lib/syslinux/isolinux.bin ../images/isolinux/alt0/* .tmp/isolinux
-PARTIMAGE_RPM=$rpm DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1
+DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1
mkdir -p .tmp/install/stage2
mv -f rescue.sqfs .tmp/install/stage2
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index a58cb0b79..cf8c2f7e9 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -54,10 +54,6 @@ if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) {
} "$tmp/etc/rc.sysinit";
}
-if ($ENV{PARTIMAGE_RPM}) {
- #_ "rpm2cpio $ENV{PARTIMAGE_RPM} | (cd $tmp ; cpio -idu ./usr/sbin/partimage)";
-}
-
exit 0 if $ARGV[0];
_ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null";