From 12075af8c39364b185dfa3a271b8d4af924f8b0c Mon Sep 17 00:00:00 2001 From: Francesco Riosa Date: Thu, 24 Nov 2005 14:59:24 +0000 Subject: [PATCH] fix to rc script Package-Manager: portage-2.0.53_rc6 --- dev-db/mysql/Manifest | 2 +- dev-db/mysql/files/mysql-slot.rc6 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index a85df3f64624..25c15658493f 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -17,7 +17,7 @@ MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 MD5 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151 MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218 -MD5 3f0cf4e6c3cb45ef2e8019cdd2423c28 files/mysql-slot.rc6 8697 +MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691 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/mysql-slot.rc6 b/dev-db/mysql/files/mysql-slot.rc6 index 7997b236ca0e..efd6ff978cf2 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.5 2005/11/24 14:03:52 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.6 2005/11/24 14:59:24 vivo Exp $ # external binaryes used: which, sed, tac @@ -280,7 +280,7 @@ stop () { pidfile=${shutdown_elem#*=} ebegin "Stopping mysqld (${runwhat})" # following code grabbed from the squid rc script - PID=$(cat /var/run/squid.pid 2>/dev/null) + PID=$(cat "${pidfile}" 2>/dev/null) start-stop-daemon --stop --quiet --pidfile="${pidfile}" sleep 2 if test -n "$PID" && kill -0 $PID 2>/dev/null -- 2.26.2