aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2006-01-17 22:22:25 +0000
committerintrigeri <intrigeri@boum.org>2006-01-17 22:22:25 +0000
commitbadd9c82b9d719db83b2a452125ee538aaf5b6a3 (patch)
tree7ad0c4eaabdd538a5f4912f05e1a94523e62b5ce
parent2f209f803136ff7dfe0dd1bb30040b1ee354c851 (diff)
downloadbackupninja-badd9c82b9d719db83b2a452125ee538aaf5b6a3.tar.gz
backupninja-badd9c82b9d719db83b2a452125ee538aaf5b6a3.tar.bz2
backupninja.in: improved VROOTDIR detection as in lib/vserver.in
-rw-r--r--ChangeLog5
-rwxr-xr-xsrc/backupninja.in2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03da8f7..2c65f50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,8 +24,11 @@ version 0.9.3 -- unreleased
ninjahelper:
. now reports error if the helper script has a syntax error or bombs out.
. code formatting cleanup (three spaces indent)
+ lib changes
+ vserver:
+ . improved VROOTDIR detection
known bugs:
- easydialog:
+ easydialog:
. formDisplay does not return exit status.
version 0.9.2 -- December 29, 2005
diff --git a/src/backupninja.in b/src/backupninja.in
index 9330902..29c4e1e 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -425,7 +425,7 @@ getconf RSYNC /usr/bin/rsync
getconf vservers no
getconf VSERVERINFO /usr/sbin/vserver-info
getconf VSERVER /usr/sbin/vserver
-getconf VROOTDIR `if [ -f "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'; fi`
+getconf VROOTDIR `if [ -f "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | awk '{print $2}'; fi`
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."