summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-02-28 13:39:21 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-02-28 13:40:56 +0100
commit41b09cd702e6d9996dd05fed8c0b04b29eeb4dac (patch)
tree1a2fd53f0a743c3b0af491c01f30604e2267a40c
parent90d01b8a48d816b06a08b94744972292143dbf17 (diff)
downloadpykolab-41b09cd702e6d9996dd05fed8c0b04b29eeb4dac.tar.gz
Different paths to a mysql sock or pid (#2879)
-rw-r--r--pykolab/setup/setup_mysql.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index e9783c7..36a0bec 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -64,7 +64,10 @@ def execute(*args, **kw):
}
answer = 0
- if os.path.exists('/var/run/mysqld/mysqld.sock') or os.path.exists('/var/run/mysql/mysql.sock'):
+ if os.path.exists('/var/lib/mysql/mysql.sock') or \ # Regular old-fashioned Enterprise Linux
+ os.path.exists('/var/run/mysqld/mysqld.sock') or \ # Debian
+ os.path.exists('/var/run/mysql/mysql.sock') or \ # (open)SUSE
+ os.path.exists('/var/run/mysqld/mysqld.pid'): # "Unbreakable" Linux from Oracle
answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
if answer == "1" or answer == 1: