From e8d81c3d85b28c0df7afb44f6b26de422b4131d0 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 11 Feb 2009 14:25:13 +0000
Subject: set number and device_id only when required (setting number broke
 installation on too small disks)

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

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

diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh
index 358dbffed..046ba10e0 100755
--- a/rescue/restore-image.sh
+++ b/rescue/restore-image.sh
@@ -135,16 +135,6 @@ function resize_win32()
 		device_type=$(vol_id --type ${device})
 		modprobe ${device_type}
 
-		# get the next partition integer
-		number=$(echo ${device} | sed 's@/dev/...@@g')
-		let number++
-	
-		case ${device_type} in
-			vfat) device_id=b  ;;
-			ntfs) device_id=7  ;;
-			hpfs) device_id=87 ;;
-		esac
-
 		# df for that partition
 		mount ${device} /mnt
 		size=$(df ${device} | tail -1) 
@@ -156,6 +146,16 @@ function resize_win32()
 		avail=$((${left}/2))
 
 		if [ ! ${avail} -lt ${MIN_DISKSIZE} ]; then
+			# get the next partition integer
+			number=$(echo ${device} | sed 's@/dev/...@@g')
+			let number++
+
+			case ${device_type} in
+				vfat) device_id=b  ;;
+				ntfs) device_id=7  ;;
+				hpfs) device_id=87 ;;
+			esac
+
 			# wrapper around libdrakx by blino (it takes half of 'left')
 			diskdrake-resize ${device} ${device_type} $(($((${used}+${avail}))*2)) &>/dev/null
 
-- 
cgit v1.2.1