r213@um: micah | 2005-12-27 09:14:18 -0500

[matthijs/upstream/backupninja.git] / handlers / mysql

diff --git a/handlers/mysql b/handlers/mysql
index 965b05e9eb00b679f358865b1a5f294654ac5aed..49f80a8545816fedb760fe1d148745f5bc8526eb 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -17,22 +17,6 @@ getconf dbusername
 getconf dbpassword
 getconf configfile /etc/mysql/debian.cnf
 
-if [ "$user" == "" ]; then
-       userset=false;
-       user=root;
-else
-       userset=true;
-       userhome=`getent passwd "$user" | awk -F: '{print $6}'`
-       [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-fi
-
-## Prepare ignore part of the command
-## This only works for mysqldump at the moment
-
-ignore=''
-for i in $ignores; do
-       ignore="$ignore --ignore-table=$i"
-done
 
 # If vservers are configured, decide if the handler should
 # use them or if it should just operate on the host
@@ -62,6 +46,23 @@ then
                fatal "vserver $vsname is not running."
        fi
 fi
+
+if [ "$user" == "" ]; then
+       userset=false;
+       user=root;
+else
+       userset=true;
+       userhome=`getent passwd "$user" | awk -F: '{print $6}'`
+       [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
+fi
+
+## Prepare ignore part of the command
+## This only works for mysqldump at the moment
+
+ignore=''
+for i in $ignores; do
+       ignore="$ignore --ignore-table=$i"
+done
        
 # create backup dirs, vroot variable will be empty if no vsname was specified
 # and will proceed to operate on the host
@@ -107,7 +108,8 @@ then
     fi
     [ -d $home ] || fatal "Can't find root's home directory ($home)."
     mycnf="$home/.my.cnf"
-    if [ -f $mycnf ]; then
+    if [ -f $mycnf ]
+    then
        # rename temporarily
        tmpcnf="$home/my.cnf.disable"
        debug "mv $mycnf $tmpcnf"