X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fmysql;h=de4e4c3d2f920d8117c2e960e9c1f5e1619ccf22;hp=cd72fc9087bb7033e009f0c8125c0e75ef80b9a4;hb=be75e4e6c536882c14db9a41c61585e7a9c045f6;hpb=28338e91c351bef21a856f4280b762b9ee0dc2aa

diff --git a/handlers/mysql b/handlers/mysql
index cd72fc9..de4e4c3 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -90,10 +90,10 @@ if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
     if [ $usevserver = yes ]
     then
-    	vhome=`$VSERVER $vsname exec getent passwd "root" | awk -F: '{print $6}'`
+    	vhome=`$VSERVER $vsname exec getent passwd "root" | @AWK@ -F: '{print $6}'`
 	home="$vroot$vhome"
     else
-    	home=`getent passwd "root" | awk -F: '{print $6}'`
+    	home=`getent passwd "root" | @AWK@ -F: '{print $6}'`
     fi
 
     [ -d $home ] || fatal "Can't find root's home directory ($home)."
@@ -144,14 +144,14 @@ else
 	userset=true;
 	if [ $usevserver = yes ]
 	then
-	    vuserhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'`
+	    vuserhome=`$VSERVER $vsname exec getent passwd "$user" | @AWK@ -F: '{print $6}'`
 	    if [ $? -eq 2 ]
 	    then
 	    	fatal "User $user not found in /etc/passwd"
 	    fi
     	    userhome="$vroot$vuserhome"
 	else
-	    userhome=`getent passwd "$user" | awk -F: '{print $6}'`
+	    userhome=`getent passwd "$user" | @AWK@ -F: '{print $6}'`
 	    if [ $? -eq 2 ]
 	    then
 	    	fatal "User $user not found in /etc/passwd"
@@ -234,13 +234,13 @@ then
 	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 	    if [ $? -ne 0 ]
 	    then
-	        fatal "Authentication problem, maybe user/password is wrong"
+	        fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
 	    fi
 	else
 		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		if [ $? -ne 0 ]
 		then
-		    fatal "Authentication problem, maybe user/password is wrong"
+		    fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
 		fi
 	fi
 fi
@@ -249,16 +249,26 @@ fi
 	do
 		if [ $usevserver = yes ]
 		then
+                   # Test to make sure mysqld is running, if it is not sqldump will not work
+                   $VSERVER $vsname exec su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $vroot$dumpdir/${db}.sql.gz"
                    else
-                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
+                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $vroot$dumpdir/${db}.sql"
                    fi
 		else
+                   # Test to make sure mysqld is running, if it is not sqldump will not work
+                   su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $dumpdir/${db}.sql.gz"
                    else
-                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
+                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $dumpdir/${db}.sql"
                    fi
 		fi
 		debug "su $user -c \"$execstr\""