From 97dcf7410bdd0e528b18b517b7588351978a824a Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 17 Mar 2015 21:12:09 +0100 Subject: [PATCH] Check permissions when starting service on RHEL-6 Resolves: #1194699 Conflicts: mariadb.spec --- mariadb.spec | 2 ++ mysql.init.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mariadb.spec b/mariadb.spec index 9554acb..84db6d4 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1153,6 +1153,8 @@ fi - Do not use libedit Related: #1201988 - Let plugin dir to be owned by -common +- Use correct comment in the init script + Related: #1184604 * Sat May 02 2015 Kalev Lember - 1:10.0.17-3 - Rebuilt for GCC 5 C++11 ABI change diff --git a/mysql.init.in b/mysql.init.in index 24a110c..0a022af 100644 --- a/mysql.init.in +++ b/mysql.init.in @@ -26,7 +26,7 @@ exec="@bindir@/mysqld_safe" prog="@DAEMON_NAME@" -# Set timeouts here so they can be overridden from /etc/sysconfig/@DAEMON_NAME@ +# Set timeouts here so they can be overridden from @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ STARTTIMEOUT=300 STOPTIMEOUT=60