diff options
| -rw-r--r-- | changelog | 7 | ||||
| -rw-r--r-- | handlers/dup | 2 | ||||
| -rw-r--r-- | handlers/rdiff | 2 | ||||
| -rwxr-xr-x | handlers/sys | 14 |
4 files changed, 16 insertions, 9 deletions
@@ -9,6 +9,13 @@ version XX -- ... documented .disabled method. corrected VROOTDIR default value. added ninjahelper to the install instructions. + improved rdiff, dup and sys handlers' vservers support + prevent vserver-debiantools' $VROOTDIR/ARCHIVES directory + to be seen as a vserver + changes to sys handler + make use of configurable $VSERVERINFO instead of hard-coded vserver-info. + fixed dpkg existence test inside vserver. + fixed $nodpkg use. version 0.7 -- July 26 2005 added ninjahelper: a dialog based wizard for creating backupninja configs. diff --git a/handlers/dup b/handlers/dup index 3b4d032..7dfb766 100644 --- a/handlers/dup +++ b/handlers/dup @@ -39,7 +39,7 @@ if [ "$vservers" == "yes" ]; then [ -d "$VROOTDIR" ] || fatal "vservers enabled, but $VROOTDIR does not exist!" if [ "$vsnames" == "all" ]; then vsnames="" - for vserver in `ls $VROOTDIR | grep -v lost+found | grep -v ARCHIVES`; do + for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"`; do vsnames="$vserver $vsnames" done else diff --git a/handlers/rdiff b/handlers/rdiff index 7120e7a..10cb3c0 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -118,7 +118,7 @@ done # vsinclude if [ $usevserver ] then - for vserver in `ls $VROOTDIR|grep -v lost+found` + for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"` do for vi in $vsinclude do 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 |