From bf65cc609a86a2d2c6228f3b72a0b134ea9e615d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 11 Feb 2009 14:42:05 +0000
Subject: use win32_part_dev variable instead of testing file existence

---
 rescue/restore-image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rescue/restore-image.sh')

diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh
index 5d8c4c1b9..0aece56b1 100755
--- a/rescue/restore-image.sh
+++ b/rescue/restore-image.sh
@@ -302,7 +302,7 @@ EOF
 
 function expand_fs()
 {
-	if [ ! -s /tmp/fdisk.log ]; then
+	if [ -z "$win32_part_dev" ]; then
 		root=${root%[0-9]}1
 	fi
 	filesystem_type=$(dumpe2fs -h /dev/${root} 2>/dev/null| grep "Filesystem OS type" | awk '{ print $4 }')
@@ -340,7 +340,7 @@ function expand_fs()
 		grub_dir="$mnt_dir/boot/grub"
 		if [ -d "$grub_dir" ]; then
 		    echo "(hd0) $disk" > "$grub_dir/device.map"
-		    if [ -s /tmp/fdisk.log ]; then
+		    if [ -n "$win32_part_dev" ]; then
    	                grub_setup ${root} ${grub_dir}
                     fi
 		fi
-- 
cgit v1.2.1