projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e095b45f1958392bcdce7745483f8e0e738c47f3..83af9b9d8db6eb1e82e750298d1c50e1591a826d 100755
(executable)
--- a/
handlers/sys
+++ b/
handlers/sys
@@
-46,17
+46,20
@@
fi
if [ "$packages" == "yes" ]; then
if [ $usevserver ]
then
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
do
- running=`vserver-info $vserver RUNNING`
+ info "examining vserver: $vserver"
+ running=`$VSERVERINFO $vserver RUNNING`
if [ $running = 1 ]; then
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."
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."
fi
else
warning "vserver $vserver is not running, skipping installed packages report."
- nodpkg="$nodpkg
$vserver"
+ nodpkg="$nodpkg
|
$vserver"
fi
done
fi
done
@@
-94,7
+97,7
@@
fi
if [ $usevserver ]
then
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
do
debug "$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile"
$VSERVER $vserver exec dpkg --get-selections > $VROOTDIR/$vserver$packagesfile