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

2 files changed, 9 insertions, 3 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..."
diff --git a/templates/service/ssh/key-exchange/node.def b/templates/service/ssh/key-exchange/node.def
index a3c91b0b..00df581a 100644
--- a/templates/service/ssh/key-exchange/node.def
+++ b/templates/service/ssh/key-exchange/node.def
@@ -1,6 +1,7 @@
 type: txt
-help: Allowed key exchange algorithms
-comp_help: Specifies the available KEX (key exchange) algorithms. The KEX algorithm is used in protocol version 2 for key negotiation upon session creation. Multiple algorithms must be comma-separated. See 'ssh -Q kex' for supported KEX algorithms.
+help: Key exchange algorithms
+
+allowed: ssh -Q kex | perl -ne '$_=~s/\n/ /;print'
 
 create: sudo sed -i -e '$ a \
 KexAlgorithms $VAR(@)' /etc/ssh/sshd_config