X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=349f284817048dd29c23f59195964393b0240d72;hb=8bc9312e15bf0284b3767e1791c0de3522f410f2;hp=8054b4a7ebb898b092381399235af2504b75466a;hpb=88d1f719c580ded553e95cbc125a65bf9362e5a4;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/sys b/handlers/sys
index 8054b4a..349f284 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # this handler will save various reports of vital system information.
 # by default, all the reports are enabled and are saved in /var/backups.
@@ -32,27 +33,23 @@ getconf sfdisk_options ""
 getconf hwinfo_options ""
 
 # See if vservers are configured
-if [ "$vservers" = "yes" ]
+local usevserver=no
+if [ $vservers_are_available = yes ]
 then
-	if [ ! -d $VROOTDIR ]
-	then
-		fatal "vservers enabled, but $VROOTDIR does not exist!"
-	else
-		info "vserver method enabled"
-		usevserver=1
-	fi
+   info "vserver method enabled"
+   usevserver=yes
 fi
 
 if [ "$packages" == "yes" ]; then
-	if [ $usevserver ]
+	if [ $usevserver = yes ]
 	then
 		nodpkg="lost+found|ARCHIVES"
 		info "vserver root directory set to: $VROOTDIR"
-		for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
+		for vserver in $found_vservers
 		do
 			info "examining vserver: $vserver"
 			running=`$VSERVERINFO $vserver RUNNING`
-			if [ $running = 1 ]; then
+			if [ "$running" = "1" ]; then
 			    if [ ! -x "$VROOTDIR/$vserver`$VSERVER $vserver exec which dpkg`" ]; then
 				warning "can't find dpkg in vserver $vserver, skipping installed packages report."
 				nodpkg="$nodpkg|$vserver"
@@ -96,7 +93,7 @@ fi
 #
 
 if [ "$packages" == "yes" ]; then
-   if [ $usevserver ]
+   if [ $usevserver = yes ]
    then
       for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
       do