Merge pull request #7199 from xcat2/master

Merge from master to 2.16 branch for 2.16.4 release. (3)
xcat2 · Jun 13, 2022 · bb7a4bb · bb7a4bb
2 parents 505c884 + e1a27e1
commit bb7a4bb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/xCAT-probe/debian/xcat-probe.links b/xCAT-probe/debian/xcat-probe.links
diff --git a/xCAT-probe/xCAT-probe.spec b/xCAT-probe/xCAT-probe.spec
@@ -71,10 +71,6 @@ if [ -e %{prefix}/probe/subcmds/bin/switchprobe ]; then
 else
     mkdir -p %{prefix}/probe/subcmds/bin/
 fi
-cd %{prefix}/probe/subcmds/bin/
-if [ -e %{prefix}/bin/xcatclient ]; then
-    ln -s %{prefix}/bin/xcatclient switchprobe
-fi
 
 %preun
 #remove the bin directory if not on upgrade

diff --git a/xCAT-probe/xcatprobe b/xCAT-probe/xcatprobe
@@ -259,6 +259,19 @@ foreach my $attr (@tmpargv) {
     }
 }
 
+# Create symlink /opt/xcat/probe/subcmds/bin/switchprobe -> /opt/xcat/bin/xcatclient if not already there
+my $switchprobe_link = $plugin_dir."/bin/switchprobe";
+unless (-l $switchprobe_link) {
+    my $xcatclient = `which xcatclient`;
+    chomp($xcatclient);
+    if ($xcatclient) {
+        symlink($xcatclient, $switchprobe_link);
+    }
+    else {
+        print "Can not create symbolic link $switchprobe_link to xcatclient. xCAT-client package not installed.\n";
+        exit 1;
+    }
+}
 
 &loadsubcmds;
 if (defined($pluginname)) {

diff --git a/xCAT-test/autotest/testcase/install_xCAT/case0 b/xCAT-test/autotest/testcase/install_xCAT/case0
@@ -21,14 +21,8 @@ check:rc==0
 check:output=~running
 cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2
 
-# Check host keys supported by the operating system and report new ones, if any.
-cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
-check:rc==0
-cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
-check:rc==0
-cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
-check:output!~>
-cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
+# Obtain the highest version of TLS supported by OpenSSL/TLS.
+cmd:openssl s_client --help 2>&1 | grep "\-tls1" | awk '{print $1}' | sort | tail -1
 check:rc==0
 end
 
@@ -67,13 +61,7 @@ cmd:sleep 5
 cmd:service goconserver status
 cmd:service conserver status
 
-# Check host keys supported by the operating system and report new ones, if any.
-cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
-check:rc==0
-cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
-check:rc==0
-cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
-check:output!~>
-cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
+# Obtain the highest version of TLS supported by OpenSSL/TLS.
+cmd:openssl s_client --help 2>&1 | grep "\-tls1" | awk '{print $1}' | sort | tail -1
 check:rc==0
 end