xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #116 from SStar1314/master

Browse Source 
xCAT provision Sles11.2 will hang-on when excuting remoteshell script
This commit is contained in:
Xiaopeng Wang
2015-09-02 18:35:53 +08:00
parent c0e16c9fcf 745cf10422
commit 8f0cb07b44
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT/postscripts/remoteshell
View File

@ -281,9 +281,17 @@ if [ -f /etc/ssh/ssh_host_ecdsa_key ]; then
if ! grep "PRIVATE KEY" /etc/ssh/ssh_host_ecdsa_key > /dev/null 2>&1 ; then
rm /etc/ssh/ssh_host_ecdsa_key
else
ssh-keygen -y -f /etc/ssh/ssh_host_ecdsa_key > /etc/ssh/ssh_host_ecdsa_key.pub
chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub
chown root /etc/ssh/ssh_host_ecdsa_key.pub
# Because of openssh version differs, provisioning errors may happen when MN support ecdsa while CN don't ecdsa.
# Judge CN support ecdsa or not. "-t ecdsa" indicate the key type, "-P "" " avoid hang-on and wait for input passphrase when CN don't support ecdsa.
# If ture, means support ecdsa, then generate corresponding key.pub.
# If false, remove ssh_host_ecdsa_key useless file, to avoid future errors.
if ssh-keygen -t ecdsa -y -f /etc/ssh/ssh_host_ecdsa_key -P "" &>/dev/null ; then
ssh-keygen -y -f /etc/ssh/ssh_host_ecdsa_key > /etc/ssh/ssh_host_ecdsa_key.pub
chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub
chown root /etc/ssh/ssh_host_ecdsa_key.pub
else
rm -fr /etc/ssh/ssh_host_ecdsa_key
fi
fi
else
#This is an error message