diff options
| author | df@kahlann.erinye.com <> | 2006-12-07 15:02:32 +0100 |
|---|---|---|
| committer | df@kahlann.erinye.com <> | 2006-12-07 15:02:32 +0100 |
| commit | 77965c013cc99c153121cd33e74b18eeae29168a (patch) | |
| tree | 9929a44698f605d5a19f1cb2617b2968df1091e3 /scripts/mysqlaccess.sh | |
| parent | 6541302bb2841af6f24070ec0e8371ac064834c6 (diff) | |
| download | mariadb-git-77965c013cc99c153121cd33e74b18eeae29168a.tar.gz | |
BUG#24780 use --sysconfdir in scripts
Diffstat (limited to 'scripts/mysqlaccess.sh')
| -rw-r--r-- | scripts/mysqlaccess.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index 654b43a8a99..22e9d121f9a 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header(); if (-f "./$script_conf") { require "./$script_conf"; } - elsif (-f "/etc/$script_conf") { - require "/etc/$script_conf"; + elsif (-f "@sysconfdir@/$script_conf") { + require "@sysconfdir@/$script_conf"; } # **************************** @@ -929,7 +929,7 @@ sub MergeConfigFile { # ================================= sub MergeConfigFiles { my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<; - MergeConfigFile("/etc/my.cnf"); + MergeConfigFile("@sysconfdir@/my.cnf"); MergeConfigFile("$dir/.my.cnf"); } |