X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=lib%2Fvserver.in;h=153a9b0241929c661888a4c20fc3b2654ddf1755;hb=fd6796ad99b90371594c3068e6d8bbbdb2b1d1d5;hp=8a585bf16787dddb506e53e65b8e1de5c194a202;hpb=3b3252bfdd29b5cb4a981deb9bf61ab08e1c3de5;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/lib/vserver.in b/lib/vserver.in
index 8a585bf..153a9b0 100644
--- a/lib/vserver.in
+++ b/lib/vserver.in
@@ -33,7 +33,7 @@ init_vservers() {
    getconf vservers no
    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`
+   getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | @AWK@ '{print $2}'; fi`
    # canonicalize VROOTDIR
    [ -z "$VROOTDIR" ] || VROOTDIR=`readlink --canonicalize $VROOTDIR`
    # init this library's global variables
@@ -63,7 +63,7 @@ init_vservers() {
             "vservers enabled in $conffile, but VROOTDIR ($VROOTDIR) does not exist.";
             return
       fi
-      found_vservers=`ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES" | tr "\n" " "`
+      found_vservers=`ls $VROOTDIR | grep -E -v "lost\+found|ARCHIVES" | tr "\n" " "`
       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.";      
@@ -94,6 +94,20 @@ vservers_exist() {
    return 0
 }
 
+##
+## If all the arguments are running vservers names, returns 0.
+## Else, returns 1. Also returns 1 if no argument is given.
+##
+vservers_running() {
+   [ $# -ge 1 ] || return 1
+   local args="$1"
+   local vserver
+   for vserver in $args ; do
+      $VSERVERINFO -q $vserver RUNNING || return 1
+   done
+   return 0
+}
+
 ##
 ## If the argument is the name of a vserver selected by the current helper,
 ## echoes 'on' and returns 0.