mysql and dup handlers: when using a vserver, check if it is running

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

diff --git a/handlers/mysql b/handlers/mysql
index 13dd62f2643a9d3be9ffdcaf0e82df2555d8cdc0..e5306db4c5a42adafcafeb87e31f29f24c163328 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -28,7 +28,7 @@ fi
 # If vservers are configured, decide if the handler should
 # use them or if it should just operate on the host
 
-if [ "$VSERVERS" = "yes" ]
+if [ "$vservers" = "yes" ]
 then
        if [ ! -z $vsname ]
        then            
@@ -39,11 +39,16 @@ then
        fi
 fi
 
-# Check to make sure that the specified vserver exists
+# If needed, make sure that the specified vserver exists and is running.
 if [ $usevserver ]
 then
+        info "examining vserver '$vsname'"
+        # does it exist ?
        vroot="$VROOTDIR/$vsname"
        [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
+        # is it running ?
+        running=`$VSERVERINFO $vsname RUNNING`
+        [ $running = 1 ] || fatal "vserver $vsname is not running."
 fi
        
 # create backup dirs, the vroot variable will be empty if no vsname was specified
@@ -96,15 +101,15 @@ if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
 # auto generated backupninja mysql conf
 [mysql]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqldump]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqlhotcopy]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 EOF
        umask $oldmask
        defaultsfile="--defaults-file=$mycnf"