mirror of
https://github.com/xcat2/xcat-core.git
synced 2025-08-19 17:50:20 +00:00
Merge pull request #6572 from cxhong/sle15mysql
Modify mysqlsetup to support SLE15
This commit is contained in:
@@ -971,7 +971,7 @@ sub mysqlstart
|
||||
else
|
||||
{
|
||||
if ($::MariaDB == 1) { # running MariaDB
|
||||
if ($::linuxos =~ /rh.*/) {
|
||||
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.*/) {
|
||||
if ( ($::linuxos =~ /rh.*/) || ($::linuxos =~ /sles15.*/) ){
|
||||
$cmd = "chkconfig mariadb on";
|
||||
} else { #sles
|
||||
$cmd = "chkconfig mysql on";
|
||||
|
@@ -1,2 +1,2 @@
|
||||
xcat/xcat-core/xCATsn
|
||||
xcat/xcat-dep/sles12/x86_64/goconserver
|
||||
xcat/xcat-dep/sles15/x86_64/goconserver
|
||||
|
@@ -1,3 +0,0 @@
|
||||
-perl-doc
|
||||
xcat/xcat-core/xCATsn
|
||||
xcat/xcat-dep/sles12/x86_64/conserver-xcat
|
@@ -0,0 +1,3 @@
|
||||
-perl-doc
|
||||
xcat/xcat-core/xCATsn
|
||||
xcat/xcat-dep/sles15/ppc64le/goconserver
|
@@ -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
|
||||
|
Reference in New Issue
Block a user