diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-03-10 19:09:15 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-03-10 19:09:15 +0100 |
| commit | 442f6015f6dc99c31bb799434ee20dd7168eb222 (patch) | |
| tree | cc041ffc5ae8b6a1abbb1900b205d6bd07e283e1 /scripts/install | |
| parent | 6e7c0b944331c5aca04ed9343007b767adc5b36a (diff) | |
| parent | 65e2de337585ccec068ae7a97a824b7f6c558e26 (diff) | |
| download | vyatta-cfg-system-442f6015f6dc99c31bb799434ee20dd7168eb222.tar.gz vyatta-cfg-system-442f6015f6dc99c31bb799434ee20dd7168eb222.zip | |
Merge remote-tracking branch 'upstream/current' into current
* upstream/current:
T507: add autocompletion or SSH key exchange algorithms
sometimes drives report they are not aligned
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-get-partition | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index f1b373ae..a8590031 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -688,7 +688,12 @@ create_partitions() { lecho "Creating root partition on /dev/$ldrive" # Make the root partition - output=$(parted --script --align optimal /dev/$ldrive mkpart primary 0% $root_part_size) + # if optimal_io_size is empty use default of 2048s + if [ $(cat /sys/block/$ldrive/queue/optimal_io_size) -gt 0 ]; then + output=$(parted --script --align optimal /dev/$ldrive mkpart primary 0% $root_part_size) + else + output=$(parted --script --align optimal /dev/$ldrive mkpart primary 2048s $root_part_size) + fi status=$? if [ "$status" != 0 ]; then echo -e "Error creating primary partition on $ldrive.\nPlease see $INSTALL_LOG for more details.\nExiting..." |