options to sys

[matthijs/upstream/backupninja.git] / handlers / sys

diff --git a/handlers/sys b/handlers/sys
index fe780b5c1c2897312976bbb6cf2a5025f3bac458..bc117c406d899039039ffb3952114c38bd4d86b1 100755 (executable)
--- a/handlers/sys
+++ b/handlers/sys
@@ -26,26 +26,61 @@ 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" ]
+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
 
 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
@@ -57,24 +92,36 @@ 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. 
 # 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
 
@@ -91,10 +138,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