r263@crapouille: intrigeri | 2005-12-28 21:19:10 +0100

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

diff --git a/handlers/sys b/handlers/sys
index e095b45f1958392bcdce7745483f8e0e738c47f3..dd49a3e308af2d834685d85d4e99d75f5177c7ba 100755 (executable)
--- 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.
@@ -46,17 +47,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
@@ -92,22 +96,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 ]
+   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.