aboutsummaryrefslogtreecommitdiff
path: root/handlers/sys
diff options
context:
space:
mode:
Diffstat (limited to 'handlers/sys')
-rwxr-xr-xhandlers/sys14
1 files changed, 7 insertions, 7 deletions
diff --git a/handlers/sys b/handlers/sys
index cb0856b..83af9b9 100755
--- 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