projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2f209f8
)
backupninja.in: improved VROOTDIR detection as in lib/vserver.in
author
intrigeri
<intrigeri@boum.org>
Tue, 17 Jan 2006 22:22:25 +0000
(22:22 +0000)
committer
intrigeri
<intrigeri@boum.org>
Tue, 17 Jan 2006 22:22:25 +0000
(22:22 +0000)
ChangeLog
patch
|
blob
|
history
src/backupninja.in
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 03da8f71ea7252dbc1f3976ae78ecbc4a299ea31..2c65f50bab89a6de1e2c92ca8a1f4e08d6e851fd 100644
(file)
--- 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)
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:
known bugs:
- easydialog:
+
easydialog:
. formDisplay does not return exit status.
version 0.9.2 -- December 29, 2005
. formDisplay does not return exit status.
version 0.9.2 -- December 29, 2005
diff --git
a/src/backupninja.in
b/src/backupninja.in
index 9330902e0bfcd97721deb29011e8ffa73972315b..29c4e1ed1ca404e227c68bd12cf4d8bf083578f5 100755
(executable)
--- 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 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."
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."