aboutsummaryrefslogtreecommitdiff
path: root/handlers
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2005-12-27 17:36:21 +0000
committerMicah Anderson <micah@riseup.net>2005-12-27 17:36:21 +0000
commitf46646600fb4f89235ab3cf1e096885f1ed59666 (patch)
treea166163bb4f8c8bc90d6361da474beb25140382f /handlers
parent0ad20d5ad0d413920c65d8bcf5f0b1738962ed7e (diff)
downloadbackupninja-f46646600fb4f89235ab3cf1e096885f1ed59666.tar.gz
backupninja-f46646600fb4f89235ab3cf1e096885f1ed59666.tar.bz2
r213@um: micah | 2005-12-27 09:14:18 -0500
Move vserver initialization higher up in the chain
Diffstat (limited to 'handlers')
-rw-r--r--handlers/mysql33
1 files changed, 17 insertions, 16 deletions
diff --git a/handlers/mysql b/handlers/mysql
index b54ae95..49f80a8 100644
--- 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