modified rc6 script for slotted server. Return status OK if at least on server is started.

(Portage version: 2.0.53_rc6)

4 files changed, 29 insertions, 17 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 15f4ea41d24c..ccb2aedbfba3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.261 2005/11/19 03:58:40 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.262 2005/11/20 13:37:20 vivo Exp $
+
+  20 Nov 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6:
+  modified rc6 script for slotted server. Return status OK if at least on server
+  is started.
 
   19 Nov 2005; Francesco Riosa <vivo@gentoo.org> +files/mysql-slot.conf.d,
   +files/mysql-slot.rc6:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3421b37deaa2..8c90f056d1e2 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 MD5 f33439a3872a7e188fbb94a4b79b5e4a ChangeLog 48482
-MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
+MD5 bd6b9a577a5647c86a61e04416d21be1 files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26-r30 139
@@ -18,7 +18,7 @@ MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
 MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
-MD5 2c8118a63df495f28f99857bd43fb86e files/mysql-slot.rc6 7484
+MD5 34a9b59ee1377964de8ceda4ede6a82d files/mysql-slot.rc6 7758
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
diff --git a/dev-db/mysql/files/digest-mysql-3.23.58-r1 b/dev-db/mysql/files/digest-mysql-3.23.58-r1
index 3a6dd30d9c0f..70bf4d4b2767 100644
--- a/dev-db/mysql/files/digest-mysql-3.23.58-r1
+++ b/dev-db/mysql/files/digest-mysql-3.23.58-r1
@@ -1,2 +1,2 @@
 MD5 835a96c86132fbde0db36db60c5b34cd mysql-3.23.58.tar.gz 12039843
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/mysql-slot.rc6 b/dev-db/mysql/files/mysql-slot.rc6
index 1b9ceb963813..75efdb637d5c 100644
--- a/dev-db/mysql/files/mysql-slot.rc6
+++ b/dev-db/mysql/files/mysql-slot.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.1 2005/11/19 03:58:41 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.2 2005/11/20 13:37:21 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -13,6 +13,7 @@ depend() {
 function in_list() {
 	local elem=${1:-"none"}
 	local list=${2:-","}
+
 	[[ "${list}" == "${list/,${elem},/}" ]] \
 		&& return 1 \
 		|| return 0
@@ -99,24 +100,24 @@ get_slot_config() {
 	for my_default in ${my_defaults}; do
 		case "${my_default}" in
 			--basedir=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					basedir="${my_default#--basedir=}"
 				fi ;;
 			--datadir=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					datadir="${my_default#--datadir=}"
 				fi ;;
 			--pid-file=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					pidfile="${my_default#--pid-file=}"
 				fi ;;
 			--socket=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					socket="${my_default#--socket=}"
 				fi ;;
 			*)
 				# check into the list of parameters we already have
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					paramlist="${paramlist}${my_default%%=*},"
 					unmanagedparams="${unmanagedparams} $(echo "${my_default}" | sed -e 's,\([^=/a-zA-Z0-9_.-]\),\\\1,g')"
 				fi
@@ -132,7 +133,7 @@ get_slot_config() {
 	done
 
 	for i in "server-id" "log-bin" ; do
-		if ! $(in_list "--${i}" "${paramlist}") ; then
+		if ! in_list "--${i}" "${paramlist}" ; then
 			ewarn "undefined $i, it's good practice set it"
 		fi
 	done
@@ -171,8 +172,7 @@ start() {
 	local globretstatus=1
 	local srv_slot srv_num
 	# server MUST NOT share same location for these
-	local pidfilelist=','
-	local datadirlist=','
+	local pidfilelist=',' datadirlist=',' socketlist=','
 
 	# additional security
 	rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
@@ -198,24 +198,28 @@ start() {
 		retstatus=0
 
 		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
 		# pre_run checks
 		[[ "$retstatus" -eq 0 ]] && checkconfig "${datadir}" || retstatus=2
 		if [[ "$retstatus" -eq 0 ]] ; then
-			if $(in_list "${pidfile}" "${pidfilelist}"); then
+			if in_list "${pidfile}" "${pidfilelist}" ; then
 				retstatus=3
 				eerror "Cowardly refusing to start another server with same ${pidfile}"
 			fi
-			if $(in_list "${datadir}" "${datadirlist}"); then
+			if in_list "${datadir}" "${datadirlist}" ; then
 				retstatus=4
 				eerror "Cowardly refusing to start another server with same ${datadir}"
 			fi
+			if in_list "${socket}" "${socketlist}" ; then
+				retstatus=5
+				eerror "Cowardly refusing to start another server with same ${socket}"
+			fi
 		fi
 
 		if [[ $retstatus -eq 0 ]] ; then
 			# additional security
 			rm -f ${pidfile} ${socket}
 			ebegin "Starting mysqld${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
+
 			start-stop-daemon --start --quiet --background \
 				${NICE:+"--nicelevel="}${NICE} \
 				--pidfile="${pidfile}" \
@@ -235,6 +239,10 @@ start() {
 			if [[ ! -S "${socket}" ]] ; then
 				eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
 				retstatus=1
+			else
+				pidfilelist="${pidfilelist}${pidfile},"
+				datadirlist="${datadirlist}${datadir},"
+				socketlist="${socketlist}${socket},"
 			fi
 		fi
 
@@ -244,7 +252,7 @@ start() {
 		fi
 	done
 	# successfull if at least one mysqld started
-	eend $retstatus
+	eend $globretstatus
 }
 
 stop () {