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

diff --git a/handlers/sys b/handlers/sys
index f111097..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.
@@ -26,32 +27,36 @@ getconf partitionsfile /var/backups/partitions.__star__.txt
 getconf hardware yes
 getconf hardwarefile /var/backups/hardware.txt
 
+getconf SFDISK `which sfdisk`
+getconf HWINFO `which hwinfo`
+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
-		for vserver in `ls $VROOTDIR |grep -v lost+found`
+		nodpkg="lost+found|ARCHIVES"
+		info "vserver root directory set to: $VROOTDIR"
+		for vserver in $found_vservers
 		do
-			running=`vserver-info $vserver RUNNING`
-			if [ $running = 1]; then
-			    if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; then
+			info "examining vserver: $vserver"
+			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
@@ -64,18 +69,18 @@ if [ "$packages" == "yes" ]; then
 fi
 
 if [ "$partitions" == "yes" ]; then
-	if [ ! -x "`which sfdisk`" ]; then
+	if [ ! -x "$SFDISK" ]; then
 		warning "can't find sfdisk, skipping partition report."
 		partitions="no"
 	fi
-	if [ ! -x "`which hwinfo`" ]; then
+	if [ ! -x "$HWINFO" ]; then
 		warning "can't find hwinfo, skipping partition report."
 		partitions="no"
 	fi
 fi
 
 if [ "$hardware" == "yes" ]; then
-	if [ ! -x "`which hwinfo`" ]; then
+	if [ ! -x "$HWINFO" ]; then
 		warning "can't find hwinfo, skipping hardware report."
 		hardware="no"
 	fi
@@ -87,36 +92,37 @@ 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. 
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-	devices=`hwinfo --disk | grep "Device File" | cut -d\  -f5`
+	devices=`$HWINFO --disk | grep "Device File" | cut -d\  -f5`
 	for dev in $devices; do
 		[ -b $dev ] || continue
 		label=${dev#/dev/}
 		label=${label//\//-}
 		outputfile=${partitionsfile//__star__/$label}
-		debug "sfdisk -d $dev > $outputfile"
-		sfdisk -d $dev > $outputfile
+		debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
+		$SFDISK $sfdisk_options -d $dev > $outputfile
 	done
 fi
 
@@ -133,10 +139,10 @@ 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
+	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
-		hwinfo --$flag >> $hardwarefile
+		$HWINFO --$flag >> $hardwarefile
 	done
 fi