Update of /cvsroot/devil-linux/build/scripts/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4378
Modified Files:
mysqld
Log Message:
make sure we detect an empty datadir and initialize mysql
Index: mysqld
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/mysqld,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mysqld 9 Apr 2008 14:29:18 -0000 1.13
+++ mysqld 28 Jun 2009 22:02:05 -0000 1.14
@@ -49,7 +49,7 @@
DATADIR=${MYSQL_PARM##*--datadir=}
DATADIR=${DATADIR%% *}
[ ! -e ${DATADIR:-/var/mysql} ] && mkdir -p ${DATADIR:-/var/mysql}
- if [ ! -d ${DATADIR:-/var/mysql}/mysql ]; then
+ if [ ! -d ${DATADIR:-/var/mysql}/mysql ] || [ $(ls -1 ${DATADIR:-/var/mysql} 2> /dev/null | wc -l) -eq 0 ] ; then
echo "Initializing new $NAME data dir: "
mkdir ${DATADIR:-/var/mysql}/mysql ${DATADIR:-/var/mysql}/test
chown -R mysql:mysql ${DATADIR:-/var/mysql}
|
