Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-08 20:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
intrigeri 2005-08-09 20:50:05 +00:00
parent f22dbec1dc
commit 4e0c31d016
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changelog
View File

@ -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.

2
handlers/dup
View File

@ -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

2
handlers/rdiff
View File

@ -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

14
handlers/sys
View File

@ -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