mysql: No longer prepend vroot to the backupdir.

[matthijs/upstream/backupninja-vserver.git] / handlers / ldap.in

diff --git a/handlers/ldap.in b/handlers/ldap.in
index d929252d0b021ec0698a47fa4e6302693cd9f46a..6197183162ae413d89d96eedec1fdc5d491ce8bd 100644 (file)
--- a/handlers/ldap.in
+++ b/handlers/ldap.in
@@ -26,7 +26,7 @@ fi
 ### VServers
 # If vservers are configured, check that the ones listed in $vsnames do exist.
 local usevserver=no
-if [ $vservers_are_available = yes ]; then
+if [ $vservers_are_available = yes -a -n "$vsnames" ]; then
    if [ "$vsnames" = all ]; then
       vsnames="$found_vservers"
    else
@@ -51,6 +51,10 @@ function make_backup() {
       vdir=""
       vexec=""
    else
+      if ! vservers_running "$vsname"; then
+         error "vserver $vsname is not running!"
+         return 1
+      fi
       info "Running on vserver $vsname"
       vdir="$VROOTDIR/$vsname"
       vexec="$VSERVER $vsname exec"