code refactor: backupninja now uses vservers lib to init vservers support

[matthijs/upstream/backupninja.git] / src / backupninja.in

diff --git a/src/backupninja.in b/src/backupninja.in
index 5db2ff12ecf45cdb36a79ac60d62018011c8f5b8..b0766eb17f62f6108744bb71f8c1ad37538738d3 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -1,5 +1,5 @@
 #!@BASH@
-# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*-
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 #                          |\_
 # B A C K U P N I N J A   /()/
@@ -398,6 +398,7 @@ fi
 
 # include shared functions
 . $libdirectory/tools
+. $libdirectory/vserver
 
 setfile $conffile
 
@@ -422,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 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."
@@ -439,11 +440,6 @@ 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.