From 250c2abb91ba442298a71440fd19e1a12feb33aa Mon Sep 17 00:00:00 2001 From: cxhong Date: Tue, 18 Feb 2020 17:06:10 -0500 Subject: [PATCH 1/3] Modify mysqlsetup to support SLE15 --- xCAT-client/bin/mysqlsetup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index b7ad6f850..43f8ff78f 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -971,7 +971,7 @@ sub mysqlstart else { if ($::MariaDB == 1) { # running MariaDB - if ($::linuxos =~ /rh.*/) { + if ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sle15.*/ { $ret = xCAT::Utils->startservice("mariadb"); } else { # sles $ret = xCAT::Utils->startservice("mysql"); @@ -1084,7 +1084,7 @@ sub mysqlreboot { if ($::MariaDB == 1) { # MariaDB not MySQL - if ($::linuxos =~ /rh.*/) { + if ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sle15.*/{ $cmd = "chkconfig mariadb on"; } else { #sles $cmd = "chkconfig mysql on"; From 344d640292549afccdf3dad619f6b38ea59d7b9a Mon Sep 17 00:00:00 2001 From: cxhong Date: Wed, 19 Feb 2020 14:57:50 -0500 Subject: [PATCH 2/3] fix syntax error --- xCAT-client/bin/mysqlsetup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index 43f8ff78f..8c0f9832a 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -971,7 +971,7 @@ sub mysqlstart else { if ($::MariaDB == 1) { # running MariaDB - if ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sle15.*/ { + if ( ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sles15.*/) ) { $ret = xCAT::Utils->startservice("mariadb"); } else { # sles $ret = xCAT::Utils->startservice("mysql"); @@ -1084,7 +1084,7 @@ sub mysqlreboot { if ($::MariaDB == 1) { # MariaDB not MySQL - if ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sle15.*/{ + if ( ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sles15.*/) ){ $cmd = "chkconfig mariadb on"; } else { #sles $cmd = "chkconfig mysql on"; From 3b44d0ad48c00392e3cb88b202c66f4296fd05b0 Mon Sep 17 00:00:00 2001 From: cxhong Date: Wed, 19 Feb 2020 17:29:34 -0500 Subject: [PATCH 3/3] modify service otherpkglist --- .../xcat/install/sles/service.sle15.x86_64.otherpkgs.pkglist | 2 +- .../share/xcat/netboot/sles/service.sle15.otherpkgs.pkglist | 3 --- .../xcat/netboot/sles/service.sle15.ppc64le.otherpkgs.pkglist | 3 +++ .../xcat/netboot/sles/service.sle15.x86_64.otherpkgs.pkglist | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 xCAT-server/share/xcat/netboot/sles/service.sle15.otherpkgs.pkglist create mode 100644 xCAT-server/share/xcat/netboot/sles/service.sle15.ppc64le.otherpkgs.pkglist diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/sles/service.sle15.x86_64.otherpkgs.pkglist index a9d86fded..1785e3c01 100644 --- a/xCAT-server/share/xcat/install/sles/service.sle15.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/install/sles/service.sle15.x86_64.otherpkgs.pkglist @@ -1,2 +1,2 @@ xcat/xcat-core/xCATsn -xcat/xcat-dep/sles12/x86_64/goconserver +xcat/xcat-dep/sles15/x86_64/goconserver diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.otherpkgs.pkglist deleted file mode 100644 index 7fe170d23..000000000 --- a/xCAT-server/share/xcat/netboot/sles/service.sle15.otherpkgs.pkglist +++ /dev/null @@ -1,3 +0,0 @@ --perl-doc -xcat/xcat-core/xCATsn -xcat/xcat-dep/sles12/x86_64/conserver-xcat diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.ppc64le.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.ppc64le.otherpkgs.pkglist new file mode 100644 index 000000000..a0927eb0f --- /dev/null +++ b/xCAT-server/share/xcat/netboot/sles/service.sle15.ppc64le.otherpkgs.pkglist @@ -0,0 +1,3 @@ +-perl-doc +xcat/xcat-core/xCATsn +xcat/xcat-dep/sles15/ppc64le/goconserver diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.x86_64.otherpkgs.pkglist index 7fe170d23..24c1440fd 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sle15.x86_64.otherpkgs.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sle15.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ -perl-doc xcat/xcat-core/xCATsn -xcat/xcat-dep/sles12/x86_64/conserver-xcat +xcat/xcat-dep/sles15/x86_64/goconserver