From facd3fa17db38b76976f6a45cf7e00896d56b6fe Mon Sep 17 00:00:00 2001 From: micah Date: Tue, 27 Dec 2005 17:36:21 +0000 Subject: [PATCH] r213@um: micah | 2005-12-27 09:14:18 -0500 Move vserver initialization higher up in the chain git-svn-id: http://code.autistici.org/svn/backupninja/trunk@274 758a04ac-41e6-0310-8a23-8373a73cc35d --- handlers/mysql | 33 +++++++++++++++++---------------- 1 file 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 -- 2.30.2