From 73c1ab6961efe80a30188c3addbc4cfa5a1ffcf7 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 17 Mar 2017 16:48:30 -0400
Subject: [PATCH] Workaround ssh pickiness

ssh from sles12 to rhel7 node during install causes SIGABORT
on the sles12 install pre-reboot.  Workaround by
sticking to the AES ciphers at that stage.
---
 xCAT/postscripts/remoteshell | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index c2023426a..dca6f7a0a 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -494,7 +494,10 @@ fi
 if [ "$?" != "0" ];then
    PIDLIST=`ps aux | grep -v grep | grep "/usr/sbin/sshd"|awk -F" " '{print $2}'|xargs` 
    [ -n "$PIDLIST" ] && kill 9 $PIDLIST
-   /usr/sbin/sshd  
+   # Temporarily stick to the aes ciphers, some compatibility issues with other ciphers
+   /usr/sbin/sshd -o Ciphers=$(ssh -Q cipher|grep aes|tr '\n' ',') 
+   # Run without argument, in case above breaks
+   /usr/sbin/sshd
 fi
 
 kill -9 $CREDPID