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

diff --git a/handlers/mysql.in b/handlers/mysql.in
index c80a36a..39c1fb9 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
 
@@ -176,7 +182,7 @@ then
 	    	info "dbhost: $dbhost"
 		execstr="$VSERVER $vsname exec $MYSQLHOTCOPY -h $dbhost --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	else
-		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+		execstr="$MYSQLHOTCOPY -h $dbhost --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	fi
 	debug "su $user -c \"$execstr\""
 	if [ ! $test ]
@@ -197,9 +203,9 @@ then
 	do
 		if [ $usevserver = yes ]
 		then
-			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --allowold $db $hotdir"
+			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY -h $dbhost --allowold $db $hotdir"
 		else
-			execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
+			execstr="$MYSQLHOTCOPY -h $dbhost --allowold $db $hotdir"
 		fi
 		debug 'su $user -c \"$execstr\"'
 		if [ ! $test ]