From 5fd937b133f50bf3803479ef572e180ba88ed15a Mon Sep 17 00:00:00 2001 From: cxhong Date: Tue, 14 Jan 2020 09:49:48 -0500 Subject: [PATCH 1/2] Add isserv to sle15 pkglist --- .../share/xcat/install/sles/compute.sle15.pkglist | 1 + .../share/xcat/install/sles/service.sle15.pkglist | 1 + .../share/xcat/netboot/sles/compute.sle15.pkglist | 1 + .../xcat/netboot/sles/compute.sle15.x86_64.pkglist | 1 + .../share/xcat/netboot/sles/service.sle15.pkglist | 1 + xCAT-test/xcattest | 12 +++++++++--- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist index c660ed5ed..d0e2349c4 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist +++ b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist @@ -2,3 +2,4 @@ iputils vim openssl rsync +insserv diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist index 23c37900d..5ef5e42e6 100644 --- a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist +++ b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist @@ -3,6 +3,7 @@ openssl ntp rsync +insserv nmap perl-DBI vsftpd diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist index f15625428..85c179ae5 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist @@ -46,3 +46,4 @@ kernel-default kernel-firmware adaptec-firmware xz +insserv diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist index 20881c2af..2d2bb3c8b 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist @@ -47,3 +47,4 @@ kernel-firmware adaptec-firmware xz SLE_HPC-release +insserv diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist index 447e5a3ea..94909bff9 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist @@ -57,6 +57,7 @@ vsftpd wget which zypper +insserv #for database unixODBC diff --git a/xCAT-test/xcattest b/xCAT-test/xcattest index 500f33b08..7cc2a4641 100755 --- a/xCAT-test/xcattest +++ b/xCAT-test/xcattest @@ -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"; } From 2dfd99be1ddb3a5ef06cb503138ab988e44d4c98 Mon Sep 17 00:00:00 2001 From: cxhong Date: Tue, 14 Jan 2020 10:35:50 -0500 Subject: [PATCH 2/2] change insserv to insserv-compat --- xCAT-server/share/xcat/install/sles/compute.sle15.pkglist | 2 +- xCAT-server/share/xcat/install/sles/service.sle15.pkglist | 2 +- xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist | 2 +- .../share/xcat/netboot/sles/compute.sle15.x86_64.pkglist | 2 +- xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist index d0e2349c4..a49fdbcb6 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist +++ b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist @@ -2,4 +2,4 @@ iputils vim openssl rsync -insserv +insserv-compat diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist index 5ef5e42e6..a54f4327b 100644 --- a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist +++ b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist @@ -3,7 +3,7 @@ openssl ntp rsync -insserv +insserv-compat nmap perl-DBI vsftpd diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist index 85c179ae5..e5d22e067 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist @@ -46,4 +46,4 @@ kernel-default kernel-firmware adaptec-firmware xz -insserv +insserv-compat diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist index 2d2bb3c8b..03cddb1b0 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist @@ -47,4 +47,4 @@ kernel-firmware adaptec-firmware xz SLE_HPC-release -insserv +insserv-compat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist index 94909bff9..b10f772d1 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist @@ -57,7 +57,7 @@ vsftpd wget which zypper -insserv +insserv-compat #for database unixODBC