diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-03-13 20:10:08 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-03-13 20:10:08 +0000 |
| commit | e12355cc279d0c0a8702cf681643d168e34d99d7 (patch) | |
| tree | cccde52d4f13ffdbabeb462b0cf96b2117178289 /dev-db/mysql | |
| parent | Ooops... This shouldn't have replaced kdebase-startkde, but rather kdebase-ap... (diff) | |
| download | gentoo-2-e12355cc279d0c0a8702cf681643d168e34d99d7.tar.gz gentoo-2-e12355cc279d0c0a8702cf681643d168e34d99d7.tar.bz2 gentoo-2-e12355cc279d0c0a8702cf681643d168e34d99d7.zip | |
Bug #85095, remember to commit the correct final copy of an init.d script instead of an older one!
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-4.0.24-r1.rc6 | 25 |
2 files changed, 18 insertions, 14 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 34a4859fcec0..63f388366991 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,11 @@ # 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.185 2005/03/13 19:50:57 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.186 2005/03/13 20:10:08 robbat2 Exp $ + + 13 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> + files/mysql-4.0.24-r1.rc6: + Bug #85095, remember to commit the correct final copy of an init.d script + instead of an older one! 13 Mar 2005; Jason Wever <weeve@gentoo.org> mysql-4.0.24.ebuild: Stable on SPARC wrt security bug #84819. diff --git a/dev-db/mysql/files/mysql-4.0.24-r1.rc6 b/dev-db/mysql/files/mysql-4.0.24-r1.rc6 index f55c45418b8a..48733702bffd 100644 --- a/dev-db/mysql/files/mysql-4.0.24-r1.rc6 +++ b/dev-db/mysql/files/mysql-4.0.24-r1.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-4.0.24-r1.rc6,v 1.1 2005/03/13 05:54:00 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r1.rc6,v 1.2 2005/03/13 20:10:08 robbat2 Exp $ depend() { use dns net @@ -9,9 +9,6 @@ depend() { getconfig() { - MY_NAME="(`basename $1`)" - [ -z "${MY_NAME/(mysql)}" ] && MY_NAME="" - MY_CNF=${MY_CNF=/etc/mysql/my.cnf} if [ ! -f ${MY_CNF} ]; then eerror "No ${MY_CNF} file exists! Using automatic defaults!" @@ -20,16 +17,18 @@ getconfig() { #dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'` #dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` local mysqld_cnf="`my_print_defaults --config-file=${MY_CNF} mysqld`" - dir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` - pid_file=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1` + datadir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` + pidfile=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1` # push these out to the script - export MY_NAME MY_CNF pid_file datadir + export MY_CNF + export pidfile + export datadir } checkconfig() { getconfig - if [ -z "$datadir" ]; then + if [ -z "${datadir}" ]; then eerror "Your mysql doesn't have any datadir setting, default or specific" eerror "Please check your my.cnf : ${MY_CNF}" return 1 @@ -45,16 +44,16 @@ checkconfig() { start() { getconfig checkconfig || return 1 - ebegin "Starting mysqld (${MY_NAME})" - start-stop-daemon --start --quiet --pidfile=${pid_file} + ebegin "Starting mysqld (${MY_CNF})" + start-stop-daemon --start --quiet --background \ --exec /usr/bin/mysqld_safe \ - --background --defaults-file=${MY_CNF} -- >/dev/null 2>&1 + -- --defaults-file=${MY_CNF} >/dev/null 2>&1 eend $? } stop () { getconfig - ebegin "Stopping mysqld (${MY_NAME})" - start-stop-daemon --stop --retry 5 --quiet --pidfile=${pid_file} + ebegin "Stopping mysqld (${MY_CNF})" + start-stop-daemon --stop --retry 5 --quiet --pidfile=${pidfile} eend $? } |