xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6526 from cxhong/sle15mn

Browse Source 
Add insserv-compat to sle15 pkglist
This commit is contained in:
Mark Gurevich 2020-01-14 13:41:21 -05:00 committed by GitHub
commit 6789d2f917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
View File

@ -2,3 +2,4 @@ iputils
vim
openssl
rsync
insserv-compat

1
xCAT-server/share/xcat/install/sles/service.sle15.pkglist
View File

@ -3,6 +3,7 @@
openssl
ntp
rsync
insserv-compat
nmap
perl-DBI
vsftpd

1
xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist
View File

@ -46,3 +46,4 @@ kernel-default
kernel-firmware
adaptec-firmware
xz
insserv-compat

1
xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist
View File

@ -47,3 +47,4 @@ kernel-firmware
adaptec-firmware
xz
SLE_HPC-release
insserv-compat

1
xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist
View File

@ -57,6 +57,7 @@ vsftpd
wget
which
zypper
insserv-compat
#for database
unixODBC

12
xCAT-test/xcattest
View File

@ -848,7 +848,7 @@ sub load_config_file {
}
} elsif ($type eq "Varible") {
##NODE_BLOCK##
if ($line =~ /(\w+)\s*=\s*([\w\.\-\+\/:]+)/) {
if ($line =~ /(\w+)\s*=\s*([\w\.\-\+\ \/:]+)/) {
$$config_ref{var}{$1} = $2;
}
}
@ -1796,10 +1796,16 @@ sub is_valid_case_name {
sub get_current_os {
if (-f "/etc/redhat-release") {
return "rhels";
} elsif (-f "/etc/SuSE-release") {
return "sles";
} elsif (-f "/etc/lsb-release") {
return "ubuntu";
} elsif (-f "/etc/os-release") {
my $file="/etc/os-release";
&runcmd("grep -q sles $file");
if ($::RUNCMD_RC == 0) {
return "sles";
}
} elsif (-f "/etc/SuSE-release") {
return "sles";
} else {
return "aix";
}