summaryrefslogtreecommitdiff
path: root/scripts/install-system
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-11-17 12:34:16 -0800
committerRick Balocca <rbalocca@vyatta.com>2008-11-17 12:34:16 -0800
commite0dff9d2bb3a141577dcc8f04e4a2fa10943b8d5 (patch)
treed1a1c147c514c15ebff7fbac1648dfd5de14ca3e /scripts/install-system
parent1f36720eb1d5373ce244ef99a68a1b251535b746 (diff)
parentdc24799bd733e6d32170a611b88968ba685504b7 (diff)
downloadvyatta-cfg-quagga-e0dff9d2bb3a141577dcc8f04e4a2fa10943b8d5.tar.gz
vyatta-cfg-quagga-e0dff9d2bb3a141577dcc8f04e4a2fa10943b8d5.zip
Merge branch 'islavista' into jenner
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-xscripts/install-system14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/install-system b/scripts/install-system
index bb1c4385..65a31571 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -356,14 +356,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")
@@ -381,12 +381,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
@@ -653,7 +653,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