From 6ccbc23b5ce8622ed441ef98e22a9a5bceb659fc Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 5 Nov 2008 15:23:57 +0000
Subject: add disk and main_part variables

---
 rescue/restore-image.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh
index 2e0c37dc9..49d5f59c1 100755
--- a/rescue/restore-image.sh
+++ b/rescue/restore-image.sh
@@ -150,9 +150,11 @@ function expand_fs()
 	filesystem_type=$(dumpe2fs -h /dev/${root}1 2>/dev/null| grep "Filesystem OS type" | awk '{ print $4 }')
 	if [ $filesystem_type = "Linux" ]; then
                 dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "Installing...  Finishing Install..." 3 40
-		sfdisk -d /dev/$root | sed -e "/${root}1/  s/size=.*,/size= ,/" | sfdisk -f /dev/$root
-		e2fsck -fy /dev/${root}1
-		resize2fs /dev/${root}1
+		disk=/dev/$root
+		main_part=/dev/${root}1
+		sfdisk -d $disk | sed -e "\|$main_part|  s/size=.*,/size= ,/" | sfdisk -f $disk
+		e2fsck -fy $main_part
+		resize2fs $main_part
 	fi
 }
 
-- 
cgit v1.2.1