From: intrigeri Date: Tue, 17 Jan 2006 22:22:25 +0000 (+0000) Subject: backupninja.in: improved VROOTDIR detection as in lib/vserver.in X-Git-Tag: backupninja-0.9.3~35 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=badd9c82b9d719db83b2a452125ee538aaf5b6a3;p=matthijs%2Fupstream%2Fbackupninja.git backupninja.in: improved VROOTDIR detection as in lib/vserver.in --- 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."