X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=lib%2Fvserver.in;h=bb1a1528334e80bdd7a181b522912648717950c7;hb=96023985bce5fc3186487a08efe1e3b665574ced;hp=7108dac78563aea64ffef4c43e6f040a04d2c261;hpb=04ed966851a3201c8f604b6f2a97539d5eecd110;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/lib/vserver.in b/lib/vserver.in
index 7108dac..bb1a152 100644
--- a/lib/vserver.in
+++ b/lib/vserver.in
@@ -34,6 +34,8 @@ init_vservers() {
    getconf VSERVERINFO /usr/sbin/vserver-info
    getconf VSERVER /usr/sbin/vserver
    getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | awk '{print $2}'; fi`
+   # canonicalize VROOTDIR
+   VROOTDIR=`readlink --canonicalize $VROOTDIR`
    # init this library's global variables
    vservers_are_available=no
    found_vservers=
@@ -62,7 +64,11 @@ init_vservers() {
             return
       fi
       found_vservers=`ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES" | tr "\n" " "`
-      [ -n "$found_vservers" ] || return
+      if [ -z "$found_vservers" ]; then
+         `if [ "$arg" = nodialog ]; then echo warning; else echo "msgBox warning"; fi` \
+            "vservers enabled in $conffile, but no vserver was found in $VROOTDIR.";      
+            return
+      fi
       vservers_are_available=yes
    fi
 }