From 045cc5c6f4f93f5768f26fce48e0a198ba81837e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 13 Jun 2008 13:17:04 +0000
Subject: drop support for special partimage rpm, changes are merged in the
 main package

---
 rescue/make_partimage_save_rest_all | 5 ++---
 rescue/make_rescue_img              | 4 ----
 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";
-- 
cgit v1.2.1