projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the Makefile.in to actually work (for real)
[matthijs/upstream/backupninja.git]
/
src
/
backupninja.in
diff --git
a/src/backupninja.in
b/src/backupninja.in
index 68c7c430c06a1587f25af3f9f2218c9b30a1ac7f..b0766eb17f62f6108744bb71f8c1ad37538738d3 100755
(executable)
--- a/
src/backupninja.in
+++ b/
src/backupninja.in
@@
-1,4
+1,6
@@
#!@BASH@
#!@BASH@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+#
# |\_
# B A C K U P N I N J A /()/
# `\|
# |\_
# B A C K U P N I N J A /()/
# `\|
@@
-148,7
+150,7
@@
function tolower() {
# simple to integer function
function toint() {
# simple to integer function
function toint() {
- echo "$1" | tr
[:alpha:] -d
+ echo "$1" | tr
-d [:alpha:]
}
#
}
#
@@
-396,6
+398,7
@@
fi
# include shared functions
. $libdirectory/tools
# include shared functions
. $libdirectory/tools
+. $libdirectory/vserver
setfile $conffile
setfile $conffile
@@
-420,10
+423,10
@@
getconf PGSQLDUMP /usr/bin/pg_dump
getconf PGSQLDUMPALL /usr/bin/pg_dumpall
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
getconf PGSQLDUMPALL /usr/bin/pg_dumpall
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`
+
+# initialize vservers support
+# (get config variables and check real vservers availability)
+init_vservers nodialog
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
@@
-437,11
+440,6
@@
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.