xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-30 14:58:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7199 from xcat2/master

Browse Source 
Merge from master to 2.16 branch for 2.16.4 release. (3)
This commit is contained in:
Mark Gurevich
2022-06-13 08:44:28 -04:00
committed by GitHub
parent 505c884d9a e1a27e1fe8
commit bb7a4bbbc8
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-probe/debian/xcat-probe.links
View File

@@ -1 +0,0 @@
/opt/xcat/bin/xcatclient /opt/xcat/probe/subcmds/bin/switchprobe

4
xCAT-probe/xCAT-probe.spec
View File

@@ -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

13
xCAT-probe/xcatprobe
View File

@@ -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)) {

20
xCAT-test/autotest/testcase/install_xCAT/case0
View File

@@ -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