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

diff --git a/handlers/sys b/handlers/sys
index cb0856b..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,34 +33,30 @@ 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"
+		nodpkg="lost+found|ARCHIVES"
 		info "vserver root directory set to: $VROOTDIR"
-		for vserver in `ls $VROOTDIR |grep -v $nodpkg`
+		for vserver in $found_vservers
 		do
 			info "examining vserver: $vserver"
-			running=`vserver-info $vserver RUNNING`
-			if [ $running = 1 ]; then
-			    if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; then
+			running=`$VSERVERINFO $vserver RUNNING`
+			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"
+				nodpkg="$nodpkg|$vserver"
 			    fi
 			else
 			    warning "vserver $vserver is not running, skipping installed packages report."
-			    nodpkg="$nodpkg $vserver"
+			    nodpkg="$nodpkg|$vserver"
 			fi
 
 		done
@@ -95,22 +92,23 @@ fi
 # here we grab a list of the packages installed and removed.
 #
 
-if [ $usevserver ]
-then
-	for vserver in `ls $VROOTDIR | grep -v $nodpkg | grep -v lost+found`
-	do
-		debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile"
-		$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile
-	done
-fi
-
-# We want to perform this on the host as well
 if [ "$packages" == "yes" ]; then
-	debug "dpkg --get-selections > $packagesfile"
-	dpkg --get-selections > $packagesfile
+   if [ $usevserver = yes ]
+   then
+      for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
+      do
+	 debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile"
+	 $VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile
+      done
+   fi
+   
+# We want to perform this on the host as well
+   if [ "$packages" == "yes" ]; then
+      debug "dpkg --get-selections > $packagesfile"
+      dpkg --get-selections > $packagesfile
+   fi
 fi
 
-
 ## PARTITIONS #############################
 
 # here we use sfdisk to dump a listing of all the partitions.