X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql.in;h=3a908f68ef669b62e6c0cb3d63eeb230a5b86199;hb=85f69abc9779dd28c0dfdf128aa4c77e08fe3b7f;hp=c80a36a3d95881ba0aa8b4f8ba5fd20ec3efce05;hpb=93ec0b499ed605dabf4188a8bd94c5262b4911ba;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql.in b/handlers/mysql.in
index c80a36a..3a908f6 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -40,6 +40,8 @@ if [ $vservers_are_available = yes ]; then
    else
       info "No vserver name specified, actions will be performed on the host."
    fi
+else
+   [ -z "$vsname" ] || warning 'vservers support disabled in backupninja.conf, vsname configuration line will be ignored'
 fi
 
 ## Prepare ignore part of the command
@@ -159,7 +161,11 @@ else
 	
 	debug "User home set to: $userhome"
 	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-	defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
+        if [ $usevserver = yes ]; then
+            defaultsfile="--defaults-extra-file=$vuserhome/.my.cnf"
+        else
+            defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
+        fi
 	debug "using $defaultsfile"
 fi