summaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2017-12-27 22:29:53 +0100
committerChristian Poessinger <christian@poessinger.com>2017-12-27 23:33:29 +0100
commit28ab553cfbe8d682314d61d0bac520deacfa14c7 (patch)
treeaaa114e2b5190ae3a90b7d6815eb9c02bef8a6de /scripts/install
parent9499b3e5f88ce72054046ac8a6c0da305f1b5fa4 (diff)
downloadvyatta-cfg-system-28ab553cfbe8d682314d61d0bac520deacfa14c7.tar.gz
vyatta-cfg-system-28ab553cfbe8d682314d61d0bac520deacfa14c7.zip
T496: remove diagnostic partition for RAID1 installs
Diffstat (limited to 'scripts/install')
-rwxr-xr-xscripts/install/install-get-partition22
1 files changed, 2 insertions, 20 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index 0ddbd443..f1b373ae 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -259,12 +259,12 @@ check_for_new_raid () {
done
# Need to leave space on both disks between the MBR and the start
- # of the first partition for grub. Grub needs to embed a large
+ # of the first partition for grub. Grub needs to embed a large
# boot image there when booting off RAID devices.
#
# Partition creation variables are in units of megabytes.
part_start_offset=2
- part_diag_size=60
+ data_dev=1
if [ $drivesize1 -lt $drivesize2 ]; then
root_size=$drivesize1
@@ -272,24 +272,6 @@ check_for_new_raid () {
root_size=$drivesize2
fi
- let min_size_with_diag=${MIN_ROOT}+${part_diag_size}
- 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")
- if [ "$diag_response" == "yes" ] || [ "$diag_response" == "y" ]; then
- for drive in $drives; do
- echo "Creating diag partition on drive $drive"
- create_partitions "$drive" $part_diag_size $part_start_offset "no"
- sfdisk --change-id /dev/$drive 1 0x6
- done
- data_dev=2
- let part_start_offset+=$part_diag_size
- else
- data_dev=1
- fi
- fi
-
let root_size-=$part_start_offset
for drive in $drives; do