summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2005-12-08 17:44:12 +0000
committerFrancesco Riosa <vivo@gentoo.org>2005-12-08 17:44:12 +0000
commite4e99349113401018fa5548c8017a50681f76da2 (patch)
tree004c66189b6102a789562fee8ee0d3a33a537f27 /dev-db
parentAdd new ebuild for nopaste, a command-line interface to rafb.net/paste (diff)
downloadgentoo-2-e4e99349113401018fa5548c8017a50681f76da2.tar.gz
gentoo-2-e4e99349113401018fa5548c8017a50681f76da2.tar.bz2
gentoo-2-e4e99349113401018fa5548c8017a50681f76da2.zip
start-stop-script enhancements after a talk with UberLord in irc
(Portage version: 2.0.53)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest4
-rw-r--r--dev-db/mysql/files/mysql-slot.rc6-r110
-rw-r--r--dev-db/mysql/files/mysqlmanager-slot.rc68
4 files changed, 16 insertions, 12 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index c6cbc62b4724..c539d38a9451 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.275 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.276 2005/12/08 17:44:11 vivo Exp $
+
+ 08 Dec 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r1,
+ files/mysqlmanager-slot.rc6:
+ start-stop-script enhancements after a talk with UberLord in irc
*mysql-5.1.3_alpha-r30 (09 Dec 2005)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 25544ed0e1c2..82c9cb3f79d4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -21,10 +21,10 @@ MD5 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151
MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
MD5 624541a36c1aae85e3999078d2468215 files/mysql-slot.conf.d-r1 2999
MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691
-MD5 146ca8078b72321f4ba054b1a56a492c files/mysql-slot.rc6-r1 9018
+MD5 d51a37762cc43e0f0d88c206d55a183f files/mysql-slot.rc6-r1 9016
MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
MD5 9ff84042930f67b14f418a9dcf78d860 files/mysqlmanager-slot.conf.d 1021
-MD5 7362bdfdb1b758b42286a0f03986fdab files/mysqlmanager-slot.rc6 6616
+MD5 270941d72f3456b3b6c097b037a3e8c8 files/mysqlmanager-slot.rc6 6614
MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
diff --git a/dev-db/mysql/files/mysql-slot.rc6-r1 b/dev-db/mysql/files/mysql-slot.rc6-r1
index e4056e55a47e..7a2cc597bbdc 100644
--- a/dev-db/mysql/files/mysql-slot.rc6-r1
+++ b/dev-db/mysql/files/mysql-slot.rc6-r1
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 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-r1,v 1.1 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r1,v 1.2 2005/12/08 17:44:12 vivo Exp $
# external binaryes used: which, sed, tac
@@ -225,9 +225,9 @@ start() {
[[ ${DEBUG} -ge 2 ]] && echo "starting mysqld with: "${basedir}/sbin/mysqld${MY_SUFFIX} ${unmanagedparams} --basedir=${basedir} --datadir=${datadir} --pid-file=${pidfile} --socket=${socket}
start-stop-daemon --quiet --start --background \
- ${NICE:+"--nicelevel="}${NICE} \
- --pidfile="${pidfile}" \
- --startas ${basedir}/sbin/mysqld${MY_SUFFIX} \
+ ${NICE:+"--nicelevel "}${NICE} \
+ --pidfile "${pidfile}" \
+ --exec ${basedir}/sbin/mysqld${MY_SUFFIX} \
-- \
${MY_CNF:+"--defaults-file="}${MY_CNF} \
${unmanagedparams} \
@@ -297,4 +297,4 @@ stop () {
[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
eend $retstatus
-} \ No newline at end of file
+}
diff --git a/dev-db/mysql/files/mysqlmanager-slot.rc6 b/dev-db/mysql/files/mysqlmanager-slot.rc6
index 569d4b5996a8..935d3d592ca7 100644
--- a/dev-db/mysql/files/mysqlmanager-slot.rc6
+++ b/dev-db/mysql/files/mysqlmanager-slot.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.1 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.2 2005/12/08 17:44:12 vivo Exp $
# external binaryes used: which, sed, tac
@@ -172,8 +172,8 @@ start() {
[[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket}
start-stop-daemon --quiet --start --background \
- --pidfile="${pidfile}" \
- --startas ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \
+ --pidfile "${pidfile}" \
+ --exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \
-- \
${MY_CNF:+"--defaults-file="}${MY_CNF} \
${unmanagedparams} \
@@ -226,4 +226,4 @@ stop () {
[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
eend $retstatus
-} \ No newline at end of file
+}