From: intrigeri <intrigeri@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Tue, 9 Aug 2005 20:50:05 +0000 (+0000)
Subject: Fixed/improved a few bits of rdiff, dup and sys handlers.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=79b67421c3963512395adc736ec5a700280034e8;p=matthijs%2Fupstream%2Fbackupninja.git

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

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

diff --git a/changelog b/changelog
index 96f4723..a37d6aa 100644
--- a/changelog
+++ b/changelog
@@ -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