X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fsys;h=f111097ebb2698980c08447fed4ebacc668432b0;hb=1e410a6d9574c56b7d3a3633b82220eacf782d06;hp=be8f3fca435809e90316f6af900ba1abdb817491;hpb=6b965976bd596565ce808d0cd2856fd2a4f2dd61;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/sys b/handlers/sys
index be8f3fc..f111097 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -14,22 +14,52 @@
 #     (MAKE SURE YOU PARTITION THE CORRECT DISK!!!)
 #
 # (3) hardware information. 
-#     write to a text file the important things which hwinfo can discover.
+#     write to a text file the important things which hwinfo can gleen.
 #
 
 getconf packages yes
 getconf packagesfile /var/backups/dpkg-selections.txt
 
 getconf partitions yes
-getconf partitionsfile '/var/backups/partitions.*.txt'
+getconf partitionsfile /var/backups/partitions.__star__.txt
 
 getconf hardware yes
 getconf hardwarefile /var/backups/hardware.txt
 
+# See if vservers are configured
+if [ "$VSERVERS" = "yes" ]
+then
+	if [ ! -d $VROOTDIR ]
+	then
+		fatal "vservers enabled, but $VROOTDIR does not exist!"
+	else
+		info "vserver method enabled"
+		usevserver=1
+	fi
+fi
+
 if [ "$packages" == "yes" ]; then
-	if [ ! -x "`which dpkg`" ]; then
-		warning "can't find dpkg, skipping installed packages report."
-		packages="no"
+	if [ $usevserver ]
+	then
+		for vserver in `ls $VROOTDIR |grep -v lost+found`
+		do
+			running=`vserver-info $vserver RUNNING`
+			if [ $running = 1]; then
+			    if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; then
+				warning "can't find dpkg in vserver $vserver, skipping installed packages report."
+				nodpkg="$nodpkg $vserver"
+			    fi
+			else
+			    warning "vserver $vserver is not running, skipping installed packages report."
+			    nodpkg="$nodpkg $vserver"
+			fi
+
+		done
+	else
+		if [ ! -x "`which dpkg`" ]; then
+			warning "can't find dpkg, skipping installed packages report."
+			packages="no"
+		fi
 	fi
 fi
 
@@ -57,10 +87,22 @@ 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
 fi
 
+
 ## PARTITIONS #############################
 
 # here we use sfdisk to dump a listing of all the partitions. 
@@ -91,6 +133,7 @@ if [ "$hardware" == "yes" ]; then
 	fi
 	touch $hardwarefile
 	echo -e "\n\n====================== summary ======================\n" >>  $hardwarefile
+	debug "hwinfo --short --cpu --network --disk --pci  >> $hardwarefile"
 	hwinfo --short --cpu --network --disk --pci  >> $hardwarefile
 	for flag in cpu network disk bios pci; do
 		echo -e "\n\n====================== $flag ======================\n" >>  $hardwarefile