[patch] Use ewaitfile

mysql-initd.diff (text/plain), 994 bytes, created by Davide Pesavento on 2009-05-17 13:40:47 UTC

--- mysql	2009-05-17 15:28:01.000000000 +0200
+++ /etc/init.d/mysql	2009-05-03 15:54:58.000000000 +0200
@@ -27,9 +27,10 @@
 		return 1
 	fi
 
-	local pidfile=$(get_config "${MY_CNF}" pid-file)
 	local basedir=$(get_config "${MY_CNF}" basedir)
 	local datadir=$(get_config "${MY_CNF}" datadir)
+	local pidfile=$(get_config "${MY_CNF}" pid-file)
+	local socket=$(get_config "${MY_CNF}" socket)
 
 	if [ ! -d "${datadir}" ] ; then
 		eerror "MySQL datadir \`${datadir}' is empty or invalid"
@@ -42,14 +43,21 @@
 		eerror "Please run /usr/bin/mysql_install_db to have this done..."
 		return 1
 	fi
-			
+
 	start-stop-daemon \
 		--start \
 		--exec "${basedir}"/sbin/mysqld \
 		--pidfile "${pidfile}" \
 		--background \
 		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	eend $? || return $?
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eend ${ret}
+		return ${ret}
+	fi
+
+	ewaitfile 60 "${socket}"
+	eend $? || return 1
 
 	save_options pidfile "${pidfile}"
 	save_options basedir "${basedir}"