sys: fix bug when vrootdir is on its own partition

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@450 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index 47281e46e62329e8e7e41f45a217e1e40e9299ff..245fc6243a0302f294535ae1972a033c81a86f1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ version 0.9.5 -- unreleased
     handler changes
        sys:
         . Fixed typo breaking things for VServers.
+        . Fix bug when vrootdir is on its own partition.
     fixed automake 'make install' bug that failed if /etc/backup.d already
     existed
 

diff --git a/handlers/sys b/handlers/sys
index 6ae736dc2927713cbfa6fc0d064b30ffbe1e6b77..677d5eee1b72ece94935c8e4fdf138b6a8fb88a9 100755 (executable)
--- a/handlers/sys
+++ b/handlers/sys
@@ -80,37 +80,22 @@ fi
 #
 
 if [ "$packages" == "yes" ]; then
-       if [ $usevserver = yes ]
-       then
-               nodpkg="lost+found|ARCHIVES"
-               info "vserver root directory set to: $VROOTDIR"
-               for vserver in $found_vservers
-               do
-                       info "examining vserver: $vserver"
-                       running=`$VSERVERINFO $vserver RUNNING`
-                       if [ "$running" = "1" ]; then
-                           if [ ! -x "$VROOTDIR/$vserver`$VSERVER $vserver exec which $packagemgr`" ]; then
-                              warning "can't find $packagemgr in vserver $vserver, skipping installed packages report."
-                              nodpkg="$nodpkg|$vserver"
-                           fi
-                       else
-                           nodpkg="$nodpkg|$vserver"
-                       fi
-
-               done
-       else
-               if [ -z "$packagemgr" -o ! -x "$packagemgr" ]; then 
-                       warning "can't find ${packagemgr}, skipping installed packages report."
-                       packages="no"
-               fi
-       fi
-fi
 
-if [ "$packages" == "yes" ]; then
-   if [ $usevserver = yes ]
-   then
-      for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
-      do
+   if [ $usevserver = yes ]; then
+      info "vserver root directory set to: $VROOTDIR"
+      for vserver in $found_vservers; do
+         info "examining vserver: $vserver"
+         # is it running ?
+         $VSERVERINFO -q $vserver RUNNING
+         if [ $? -ne 0 ]; then
+            warning "The vserver $vserver is not running."
+            continue
+         fi
+         # is $packagemgr available inside $vserver ?
+         if [ ! -x "$VROOTDIR/$vserver`$VSERVER $vserver exec which $packagemgr`" ]; then
+            warning "can't find $packagemgr in vserver $vserver, skipping installed packages report."
+            continue
+         fi
          # don't expand * since it can be used in $packagemgroptions
          set -o noglob
         debug "$VSERVER $vserver exec $packagemgr $packagemgroptions > $VROOTDIR/$vserver$packagesfile"
@@ -119,14 +104,17 @@ if [ "$packages" == "yes" ]; then
       done
    fi
    
-# We want to perform this on the host as well
-   if [ "$packages" == "yes" ]; then
+   # We want to perform this on the host as well
+   if [ -z "$packagemgr" -o ! -x "$packagemgr" ]; then 
+      warning "can't find ${packagemgr}, skipping installed packages report."
+   else
       # don't expand * since it can be used in $packagemgroptions
       set -o noglob
       debug "$packagemgr $packagemgroptions > $packagesfile"
       $packagemgr $packagemgroptions > $packagesfile || fatal "can not save $packagemgr info to $packagesfile"
       set +o noglob
    fi
+
 fi
 
 ## System report ##############################