diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-04-22 10:00:18 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-04-22 10:00:18 +0000 |
| commit | 75438ee94e6bc53788973b3f9ce2046a44cc4183 (patch) | |
| tree | 7e6df28275fba34533d46e64b68d431082ece819 /dev-db/mysql/files | |
| parent | fixes to comments (diff) | |
| download | gentoo-2-75438ee94e6bc53788973b3f9ce2046a44cc4183.tar.gz gentoo-2-75438ee94e6bc53788973b3f9ce2046a44cc4183.tar.bz2 gentoo-2-75438ee94e6bc53788973b3f9ce2046a44cc4183.zip | |
Fixes bug #18833
Diffstat (limited to 'dev-db/mysql/files')
| -rw-r--r-- | dev-db/mysql/files/mysql-4.0.rc6 | 4 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql.init | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dev-db/mysql/files/mysql-4.0.rc6 b/dev-db/mysql/files/mysql-4.0.rc6 index d4806ce8abda..0f01962a9c37 100644 --- a/dev-db/mysql/files/mysql-4.0.rc6 +++ b/dev-db/mysql/files/mysql-4.0.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.rc6,v 1.4 2003/02/14 22:39:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.rc6,v 1.5 2003/04/22 10:00:18 robbat2 Exp $ depend() { need net @@ -13,7 +13,7 @@ checkconfig() { eerror "No /etc/mysql/my.cnf file exists!" fi - dir=`awk '{ if ( $0 ~ /^datadir[ \t]+=/ ) { print $3 } }' < /etc/mysql/my.cnf` + dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` if [ ! -d $dir/mysql ] ; then eerror "You dont appear to have the mysql database installed yet." diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init index cedf0efc5716..8b636a0b1fdb 100644 --- a/dev-db/mysql/files/mysql.init +++ b/dev-db/mysql/files/mysql.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.4 2003/02/14 22:39:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.5 2003/04/22 10:00:18 robbat2 Exp $ depend() { need net @@ -13,7 +13,7 @@ checkconfig() { eerror "No /etc/mysql/my.cnf file exists!" fi - dir=`awk '{ if ( $0 ~ /^datadir[ \t]+=/ ) { print $3 } }' < /etc/mysql/my.cnf` + dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` if [ ! -d $dir/mysql ] ; then eerror "You dont appear to have the mysql database installed yet." |