From 126777bc019a54afb4ec51299f2cf9d2841698aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 25 Apr 2007 12:26:16 +0000
Subject: re-sync after the big svn loss

---
 rescue/make_partimage_save_rest_all | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'rescue/make_partimage_save_rest_all')

diff --git a/rescue/make_partimage_save_rest_all b/rescue/make_partimage_save_rest_all
index 20d0673b6..a51af14da 100755
--- a/rescue/make_partimage_save_rest_all
+++ b/rescue/make_partimage_save_rest_all
@@ -7,9 +7,10 @@
 
 rpm=$1 ; shift
 partimage_dir=$1 ; shift
+data_dir=$1 ; shift
 
 if [ -n "$partimage_dir" ]; then
-    first_data_dir="$partimage_dir$1"
+    first_data_dir="$partimage_dir$data_dir"
 
     [ -d "$first_data_dir" ] || {
 	echo "can't find $first_data_dir"
@@ -25,7 +26,7 @@ rm -rf .tmp
 mkdir -p .tmp/isolinux
 cp -f /usr/lib/syslinux/isolinux.bin ../isolinux/alt0/* .tmp/isolinux
 
-PARTIMAGE_DIR="$@" PARTIMAGE_RPM=$rpm DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1
+PARTIMAGE_RPM=$rpm DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1
 mkdir -p .tmp/install/stage2
 mv -f rescue.clp .tmp/install/stage2
 
@@ -44,21 +45,19 @@ label save_all
   append initrd=all.rdz $common_para save_all
 label rest_all
   kernel vmlinuz
-  append initrd=all.rdz $common_para rest_all keepmounted
+  append initrd=all.rdz $common_para rest_all keepmounted BOX=$data_dir
 label rescue
   kernel vmlinuz
   append initrd=all.rdz $common_para
 EOF
 
     if [ $action = rest_all -a -n "$partimage_dir" ]; then
-	for i in $*; do 
-	    dir=`dirname $i`
-	    mkdir -p .tmp$dir
-	    ln -s $partimage_dir$i .tmp$dir
-	done
+	dir=`dirname $data_dir`
+	mkdir -p .tmp$dir
+	ln -s $partimage_dir$data_dir .tmp$dir
     fi
 
-    mkisofs -f -o part_$action.iso -r -J -hide-rr-moved -nobak -cache-inodes -publisher Mandriva -V 'mdk part save/rest' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table .tmp    
+    genisoimage -f -o part_$action.iso -r -J -hide-rr-moved -nobak -cache-inodes -publisher Mandriva -V 'mdk part save/rest' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table .tmp    
     mkcd --addmd5 part_$action.iso
 done
  
-- 
cgit v1.2.1