mysql,pgsql,svn,sys: fixed failing "is vserver running" test

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

diff --git a/handlers/sys b/handlers/sys
index 9b836a7efce3ce43191c51f5e6dba05f6dfe6c80..66f1595f12e8e932f414b45986cf830d730beb09 100755 (executable)
--- a/handlers/sys
+++ b/handlers/sys
@@ -26,6 +26,11 @@ 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
@@ -41,17 +46,20 @@ fi
 if [ "$packages" == "yes" ]; then
        if [ $usevserver ]
        then
-               for vserver in `ls $VROOTDIR |grep -v lost+found`
+               nodpkg="lost+found|ARCHIVES"
+               info "vserver root directory set to: $VROOTDIR"
+               for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
                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 +72,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 +95,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 ]
+   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 +142,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