1
0
Эх сурвалжийг харах

Merge pull request #2141 from gejobj/patch-1

Fix MariaDB detection on Ubuntu 20.04.3 LTS
Jaap Marcus 4 жил өмнө
parent
commit
3fd036c65a

+ 4 - 4
bin/v-list-sys-services

@@ -233,6 +233,10 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then
         service="$db"
         proc_name=''
         if [ "$service" = 'mysql' ]; then
+            if [ -d "/etc/sysconfig" ]; then
+                service='mysqld'
+                proc_name='mysqld'
+            fi
             if [ -e "/lib/systemd/system/mariadb.service" ]; then
                 service='mariadb'
                 proc_name='mysqld'
@@ -244,10 +248,6 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then
                     proc_name='mariadbd'
                 fi
             fi
-            if [ -d "/etc/sysconfig" ]; then
-                service='mysqld'
-                proc_name='mysqld'
-            fi
         fi
         if [ "$service" == 'pgsql' ]; then
             service='postgresql'