projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated changelog formatting to be consistant
[matthijs/upstream/backupninja.git]
/
backupninja
diff --git
a/backupninja
b/backupninja
index 687571bf88e092bcda470163a0ef9875e00883e9..70c6640ae4dc3a9bdbdb7f433f3a7806fb046fad 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-3,7
+3,7
@@
# B A C K U P N I N J A /()/
# `\|
#
# B A C K U P N I N J A /()/
# `\|
#
-# Copyright (C) 2004 riseup.net -- property is theft.
+# Copyright (C) 2004
-05
riseup.net -- property is theft.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-426,6
+426,10
@@
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
getconf MYSQLDUMP /usr/bin/mysqldump
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
getconf MYSQLDUMP /usr/bin/mysqldump
getconf GZIP /bin/gzip
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`
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
@@
-439,6
+443,11
@@
if [ "$UID" != "0" ]; then
exit 1
fi
exit 1
fi
+if [ "$vservers" == "yes" -a ! -d "$VROOTDIR" ]; then
+ echo "vservers option set in config, but $VROOTDIR is not a directory!"
+ fatal "vservers option set in config, but $VROOTDIR is not a directory!"
+fi
+
## Process each configuration file
# by default, don't make files which are world or group readable.
## Process each configuration file
# by default, don't make files which are world or group readable.