Merge "Corrects my.cnf location in RHEL based distros"

This commit is contained in:
Jenkins
2015-03-24 13:26:41 +00:00
committed by Gerrit Code Review

View File

@@ -58,7 +58,7 @@ INCLUDE_MARKER_OPERATORS = {
} }
OS_NAME = operating_system.get_os() OS_NAME = operating_system.get_os()
MYSQL_CONFIG = {operating_system.REDHAT: "/etc/mysql/my.cnf", MYSQL_CONFIG = {operating_system.REDHAT: "/etc/my.cnf",
operating_system.DEBIAN: "/etc/mysql/my.cnf", operating_system.DEBIAN: "/etc/mysql/my.cnf",
operating_system.SUSE: "/etc/my.cnf"}[OS_NAME] operating_system.SUSE: "/etc/my.cnf"}[OS_NAME]
MYSQL_SERVICE_CANDIDATES = ["mysql", "mysqld", "mysql-server"] MYSQL_SERVICE_CANDIDATES = ["mysql", "mysqld", "mysql-server"]