From 2a6cd52057b6e0883779deeaaab9534ad321a15e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 20 Jul 2018 10:53:03 -0400 Subject: [PATCH] Correct for SLE15 SLE15 is a more unified distro. Also fix install= for SLES15, versus osimage --- xCAT-server/lib/xcat/plugins/sles.pm | 2 ++ xCAT/postscripts/remoteshell | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 7616c8d37..bd042667b 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -870,6 +870,8 @@ sub mkinstall $profile = $ent->{profile}; if ($os =~ /sles.*/) { $plat = "sles"; + } elsif ($os =~ /sle.*/) { + $plat = "sle"; } elsif ($os =~ /suse.*/) { $plat = "suse"; } else { diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell index 4b424888d..b90ae81e7 100755 --- a/xCAT/postscripts/remoteshell +++ b/xCAT/postscripts/remoteshell @@ -60,7 +60,7 @@ then echo "MaxStartups 1024" >>/etc/ssh/sshd_config if [ "$SETUPFORPCM" = "1" ]; then - if [[ $OSVER == sles* ]];then + if [[ $OSVER == sle* ]];then sed -i '/PasswordAuthentication /'d /etc/ssh/sshd_config echo "PasswordAuthentication yes" >>/etc/ssh/sshd_config elif [[ $OSVER == ubuntu* ]];then