small corrections to init.d scripts, thanks robbat2, bug #144999 #c2

4 files changed, 28 insertions, 22 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b4b7be8c0456..5ba08c0af4a1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.358 2006/08/08 13:08:37 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.359 2006/08/28 12:22:20 vivo Exp $
+
+  28 Aug 2006; Francesco Riosa <vivo@gentoo.org> files/mysql.rc6,
+  files/mysqlmanager.rc6:
+  small corrections to init.d scripts, thanks robbat2, bug #144999 #c2
 
 *mysql-5.0.24 (08 Aug 2006)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e4d76769b4c1..5660631baa54 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -22,18 +22,18 @@ AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 files/mysql.init 886
 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 files/mysql.init 886
-AUX mysql.rc6 10445 RMD160 6fcdc0579224ee423dcdad446ef8ecb823eca5ca SHA1 86121aa2dcb4c0b4865b835df7468bd6df75324d SHA256 0d5834e8cd78a3c310e22ababd0fc30446f56335b51433bf3f0f1b9ce13d09a7
-MD5 ba59d5db44dcf38427c7b2d8aeba2614 files/mysql.rc6 10445
-RMD160 6fcdc0579224ee423dcdad446ef8ecb823eca5ca files/mysql.rc6 10445
-SHA256 0d5834e8cd78a3c310e22ababd0fc30446f56335b51433bf3f0f1b9ce13d09a7 files/mysql.rc6 10445
+AUX mysql.rc6 10600 RMD160 f10fe97f716b1c14ca127d64c95f7f305c16c0e1 SHA1 a8295ec77df469ee13f7e9d352921ade0a128d97 SHA256 15a68e7b8b5d898b291bccdf7df26487975fd253c44d49b5d3059777f0a5ce9d
+MD5 e3f4ade92caa05a9e9799294d1828fc3 files/mysql.rc6 10600
+RMD160 f10fe97f716b1c14ca127d64c95f7f305c16c0e1 files/mysql.rc6 10600
+SHA256 15a68e7b8b5d898b291bccdf7df26487975fd253c44d49b5d3059777f0a5ce9d files/mysql.rc6 10600
 AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7
 MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009
 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009
 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 files/mysqlmanager.conf.d 1009
-AUX mysqlmanager.rc6 6577 RMD160 aace7c8bac3293e28fc2f3f7c44436e483dfc446 SHA1 e63475d112aff729a1b466cb3ee0ebf3a5427c1c SHA256 d58543f0fc267ec840b1de0388c5538cc25b74e957527614c61b50746e4d7bda
-MD5 a641daa781ee55e04eda4584af15d5b1 files/mysqlmanager.rc6 6577
-RMD160 aace7c8bac3293e28fc2f3f7c44436e483dfc446 files/mysqlmanager.rc6 6577
-SHA256 d58543f0fc267ec840b1de0388c5538cc25b74e957527614c61b50746e4d7bda files/mysqlmanager.rc6 6577
+AUX mysqlmanager.rc6 6619 RMD160 0a499a42736a6dac4084f43232360da9ef26c7a7 SHA1 aabd3c2e07f1238f038e0f282160c5f189df0c8d SHA256 ff72f018b70b69370d2dd3fdd01cff95882d86eccfc18127c82a2eef4b95dc43
+MD5 42c40453b050375ad7abce82b1e487dd files/mysqlmanager.rc6 6619
+RMD160 0a499a42736a6dac4084f43232360da9ef26c7a7 files/mysqlmanager.rc6 6619
+SHA256 ff72f018b70b69370d2dd3fdd01cff95882d86eccfc18127c82a2eef4b95dc43 files/mysqlmanager.rc6 6619
 DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc
 DIST mysql-4.0.25.tar.gz 11159288 RMD160 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46 SHA1 65315c7659c75fcc9f3d9f749dbed26581f6da9c SHA256 5cf5e35e4c887cc6bee19881566afb07fcf5ef711ddfc79f7b9d2c4e00c8412b
 DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f
@@ -75,10 +75,10 @@ EBUILD mysql-5.1.7_beta.ebuild 964 RMD160 21afeaffa7d082d44b3f5e9b045054ece7d041
 MD5 8f0be455676809a079f10fa49b83e907 mysql-5.1.7_beta.ebuild 964
 RMD160 21afeaffa7d082d44b3f5e9b045054ece7d0415d mysql-5.1.7_beta.ebuild 964
 SHA256 fca4d1afbc9625ca2e074a40bc8e239f2a53a1898d8bef12dfbeb27cda8ffbc7 mysql-5.1.7_beta.ebuild 964
-MISC ChangeLog 71844 RMD160 67708bac127d364a3220ca84da7afaffccbd845b SHA1 c436b82a2e53d6a86742b499b24eeb0834892a01 SHA256 7c73b2e4fe9b928975444b0b56c313263503dfc64200721bd99432e3988567c0
-MD5 3580a612dcb9300fbfabed61fc9460de ChangeLog 71844
-RMD160 67708bac127d364a3220ca84da7afaffccbd845b ChangeLog 71844
-SHA256 7c73b2e4fe9b928975444b0b56c313263503dfc64200721bd99432e3988567c0 ChangeLog 71844
+MISC ChangeLog 72008 RMD160 b735f56ff2b20877adec9dd8c5f23b13e371874e SHA1 3a02ae88f251b28027291c1a7a8c2b5b29be6c7a SHA256 fe38dae3ce0ead84eec137966c75ba12104d0ff2986ca503a2c8cf07cc2977d9
+MD5 251fb07110d94d93259501a32efb1eeb ChangeLog 72008
+RMD160 b735f56ff2b20877adec9dd8c5f23b13e371874e ChangeLog 72008
+SHA256 fe38dae3ce0ead84eec137966c75ba12104d0ff2986ca503a2c8cf07cc2977d9 ChangeLog 72008
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
diff --git a/dev-db/mysql/files/mysql.rc6 b/dev-db/mysql/files/mysql.rc6
index f49ca3998df1..e300d4f9a024 100644
--- a/dev-db/mysql/files/mysql.rc6
+++ b/dev-db/mysql/files/mysql.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.3 2006/05/05 19:51:40 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.4 2006/08/28 12:22:21 vivo Exp $
 
 # external binaries used: which, sed, tac
 
@@ -218,7 +218,7 @@ checkconfig() {
 start() {
 	wdebug 4 ">>> start()"
 
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
 	# servers are defined in /etc/conf.d/mysql
 	local serverlist=${!mysql_slot_*}
 	# provide default for empty conf.d/mysql
@@ -280,7 +280,7 @@ start() {
 		if [[ ${ssd_thing} -eq 1 ]] ; then
 			tmpnice="${NICE:+"--nicelevel "}${NICE}"
 			start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \
-			--background ${tmpnice} \
+			--background ${tmpnice} --pidfile ${pidfile} \
 			--exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing}
 			retstatus=$?
 		else
@@ -318,13 +318,15 @@ start() {
 
 stop() {
 	get_slot_config &> /dev/null
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"}
 	local runwhat pidfile shutdown_elem
 	local PID cnt timeout=${STOPTIMEOUT:-"120"}
 	local retstatus=0
 	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
 
 	ebegin "Stopping ${myservice}"
+	wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
+	wdebug 5 "shutdown_list: ${shutdown_list}"
 	for shutdown_elem in ${shutdown_list} ; do
 		runwhat=${shutdown_elem%%=*}
 		pidfile=${shutdown_elem#*=}
diff --git a/dev-db/mysql/files/mysqlmanager.rc6 b/dev-db/mysql/files/mysqlmanager.rc6
index 989cf75dcc2c..91e8b580a596 100644
--- a/dev-db/mysql/files/mysqlmanager.rc6
+++ b/dev-db/mysql/files/mysqlmanager.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.2 2006/05/05 19:51:40 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.3 2006/08/28 12:22:21 vivo Exp $
 
 # external binaries used: which, sed, tac
 
@@ -92,7 +92,7 @@ get_slot_config() {
 		esac
 	done
 
-	# some parameters
+	# still empty, I'm in doubt if assign a default or break, will see
 	basedir="${basedir:-"/usr"}"
 	pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}"
 	socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}"
@@ -113,7 +113,7 @@ get_slot_config() {
 
 start() {
 	[[ ${DEBUG} -ge 4 ]] && einfo ">>> start()"
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqlmanager"}
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
 	# servers are defined in /etc/conf.d/mysql
 	local serverlist=${!mysqlmanager_slot_*}
 	# provide default for empty conf.d/mysql
@@ -197,7 +197,7 @@ start() {
 }
 
 stop () {
-	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqlmanager"}
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"}
 	local runwhat pidfile shutdown_elem
 	local PID cnt timeout
 	local retstatus=0
@@ -205,7 +205,7 @@ stop () {
 
 	# shutdown in reverse order
 	ebegin
-	for shutdown_elem in ${shutdown_list} ; do
+	for shutdown_elem in $shutdown_list; do
 		runwhat=${shutdown_elem%%=*}
 		pidfile=${shutdown_elem#*=}
 		timeout=${STOPTIMEOUT:-"10"}