From 32f10b4a2a80a58f3ef812e3cedcb12f124abf4f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 28 Feb 2005 11:43:32 +0000
Subject: - in rest_all, try to restore from the cdrom - remove the debugging
 setting of leia as the partimage server

---
 rescue/make_rescue_img | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'rescue/make_rescue_img')

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";
-- 
cgit v1.2.1