From 088c1e447fada9f69a2851aa0dea9004d25a577f Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 28 Jul 2014 19:26:09 +0200 Subject: [PATCH] Absolut path for default value for pid file and error log --- mariadb.spec | 1 + mysql-scripts-common.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index a745952..cc9f84b 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1110,6 +1110,7 @@ fi %changelog * Mon Jul 28 2014 Honza Horak - 1:10.0.12-6 - Use explicit sysconfdir +- Absolut path for default value for pid file and error log * Tue Jul 22 2014 Honza Horak - 1:10.0.12-5 - Hardcoded paths removed to work fine in chroot diff --git a/mysql-scripts-common.sh b/mysql-scripts-common.sh index 29f3a93..2ec5fc5 100755 --- a/mysql-scripts-common.sh +++ b/mysql-scripts-common.sh @@ -48,11 +48,11 @@ datadir="$result" # log-error might be defined in mysqld_safe and mysqld sections, # the former has bigger priority get_mysql_option "$server_sections" log-error "`hostname`.err" -errlogfile="$result" +errlogfile="$datadir/$result" get_mysql_option "$server_sections" socket "@MYSQL_UNIX_ADDR@" socketfile="$result" get_mysql_option "$server_sections" pid-file "`hostname`.pid" -pidfile="$result" +pidfile="$datadir/$result"