X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=70c6640ae4dc3a9bdbdb7f433f3a7806fb046fad;hb=1b3449f24cd2ce5ec99602ef6d4286d8159e427f;hp=687571bf88e092bcda470163a0ef9875e00883e9;hpb=85cb64d249b2a31a401025b48167cab394989cb4;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/backupninja b/backupninja index 687571b..70c6640 100755 --- a/backupninja +++ b/backupninja @@ -3,7 +3,7 @@ # 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 @@ -426,6 +426,10 @@ getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy 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." @@ -439,6 +443,11 @@ if [ "$UID" != "0" ]; then 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.