Fixed/improved a few bits of rdiff, dup and sys handlers.

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

diff --git a/handlers/sys b/handlers/sys
index cb0856bd2b02a5eee728714247f1cd7544be835c..83af9b9d8db6eb1e82e750298d1c50e1591a826d 100755 (executable)
--- a/handlers/sys
+++ b/handlers/sys
@@ -46,20 +46,20 @@ fi
 if [ "$packages" == "yes" ]; then
        if [ $usevserver ]
        then
-               nodpkg="lost+found"
+               nodpkg="lost+found|ARCHIVES"
                info "vserver root directory set to: $VROOTDIR"
-               for vserver in `ls $VROOTDIR |grep -v $nodpkg`
+               for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
                do
                        info "examining vserver: $vserver"
-                       running=`vserver-info $vserver RUNNING`
+                       running=`$VSERVERINFO $vserver RUNNING`
                        if [ $running = 1 ]; then
-                           if [ ! -x "`$VSERVER $vserver exec which dpkg`" ]; 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
@@ -97,7 +97,7 @@ fi
 
 if [ $usevserver ]
 then
-       for vserver in `ls $VROOTDIR | grep -v $nodpkg | grep -v lost+found`
+       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