From dc24799bd733e6d32170a611b88968ba685504b7 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Mon, 17 Nov 2008 11:52:59 -0800
Subject: Bugfix 3932

Correct root partition size calculation in two-disk RAID-1 case when drives
are not both the same size.
---
 scripts/install-system | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/install-system b/scripts/install-system
index b48394e7..b941d9b6 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -373,14 +373,14 @@ check_for_new_raid () {
     part_start_offset=2
     part_diag_size=60
 
-    if [ $drivesize1 -gt $drivesize2 ]; then
-	size=$drivesize1
+    if [ $drivesize1 -lt $drivesize2 ]; then
+	root_size=$drivesize1
     else
-	size=$drivesize2
+	root_size=$drivesize2
     fi
 
     let min_size_with_diag=${MIN_ROOT}+${part_diag_size}
-    if [ $size -ge $min_size_with_diag ]; then
+    if [ $root_size -ge $min_size_with_diag ]; then
 	echo "Would you like me to create a $part_diag_size MB partition for diagnostics?"
 	echo -n "(Yes/No) [No]: "
 	diag_response=$(get_response "No" "Yes No Y N")
@@ -398,12 +398,12 @@ check_for_new_raid () {
 	fi
     fi
 
-    let size-=$part_start_offset
+    let root_size-=$part_start_offset
 
     for drive in $drives
     do
 	echo "Creating data partition: /dev/${drive}${data_dev}"
-	create_partitions "$drive" $size $part_start_offset "no"
+	create_partitions "$drive" $root_size $part_start_offset "no"
 	sfdisk --change-id /dev/$drive $data_dev 0xfd
     done
 
@@ -670,7 +670,7 @@ create_partitions() {
   # Make sure there is enough space on drive
   size=$(get_drive_size "$ldrive") 
   if [ "$root_part_size" -gt "$size" ]; then
-    echo "Error: $ldrive is only $size"MB" large."
+    echo "Error: $ldrive is only $size"MB" large.  Desired root is $root_part_size"
     exit 1
   fi
 
-- 
cgit v1.2.3