1 files changed, 23 insertions, 23 deletions

diff --git a/rescue/make_partimage_save_rest_all b/rescue/make_partimage_save_rest_all
index d91bfd3ec..929ffd2c1 100755
--- a/rescue/make_partimage_save_rest_all
+++ b/rescue/make_partimage_save_rest_all
@@ -1,38 +1,37 @@
 #!/bin/sh
 
-[ $# != 1 -a $# != 2 -a $# != 3 ] && { 
-    echo "usage: make_partimage_save_rest_all <partimage special rpm> [<partimage dir> [</data/box>]]" ; 
+[ $# -lt 1 ] && { 
+    echo "usage: make_partimage_save_rest_all <partimage server> [<partimage dir> <data dirs>]" ; 
     exit 1
 }
 
-rpm=$1
-partimage_dir=$2
-local_where=$3
-
-where=/data/box
-[ -z "$local_where" ] && local_where=$where
+server=$1 ; shift
+partimage_dir=$1 ; shift
+data_dir=$1 ; shift
 
 if [ -n "$partimage_dir" ]; then
-    [ -d "$partimage_dir$local_where" ] || {
-	echo "can't find $partimage_dir$local_where"
+    first_data_dir="$partimage_dir$data_dir"
+
+    [ -d "$first_data_dir" ] || {
+	echo "can't find $first_data_dir"
 	exit 1
     }
-    [ -r "$partimage_dir$local_where/lst" ] || {
-	echo "can't read $partimage_dir$local_where/*"
+    [ -r "$first_data_dir/lst" ] || {
+	echo "can't read $first_data_dir/*"
 	exit 1
     }
 fi
 
 rm -rf .tmp
 mkdir -p .tmp/isolinux
-cp -f /usr/lib/syslinux/isolinux.bin ../isolinux/alt0/* .tmp/isolinux
+cp -f /usr/lib/syslinux/isolinux.bin ../images/isolinux/alt0/* .tmp/isolinux
 
-PARTIMAGE_DIR="$where" PARTIMAGE_RPM=$rpm DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img
+DISTRIB_DESCR="partimage save/restore all" ./make_rescue_img || exit 1
 mkdir -p .tmp/install/stage2
-mv -f rescue.clp .tmp/install/stage2
+mv -f rescue.sqfs .tmp/install/stage2
 
-common_para="rescue acpi=ht automatic=method:cdrom"
-# hda=4864,255,63
+common_para="rescue automatic=method:cdrom"
+# hda=4864,255,63 acpi=ht
 
 for action in save_all rest_all; do
 
@@ -43,21 +42,22 @@ timeout 150
 
 label save_all
   kernel vmlinuz
-  append initrd=all.rdz $common_para save_all
+  append initrd=all.rdz $common_para save_all pserver=$server
 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 pserver=$server
 label rescue
   kernel vmlinuz
   append initrd=all.rdz $common_para
 EOF
 
-    if [ $action = rest_all ]; then
-	mkdir -p .tmp$where
-	ln -s $partimage_dir$local_where/* .tmp$where
+    if [ $action = rest_all -a -n "$partimage_dir" ]; then
+	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 Mandrakesoft -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 Mageia -V '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