X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=lib%2Fvserver.in;h=cc96a71050215b063d897800875e6f813298c099;hp=6a61afc2dd4419ac9f5a75538990877ff77e8be1;hb=4ecaae94054c4eb919ddbd45904d834383a09558;hpb=fa90006f17c34ed5bf10ba6f228fdab47660238d diff --git a/lib/vserver.in b/lib/vserver.in index 6a61afc..cc96a71 100644 --- a/lib/vserver.in +++ b/lib/vserver.in @@ -33,7 +33,9 @@ init_vservers() { getconf vservers no getconf VSERVERINFO /usr/sbin/vserver-info getconf VSERVER /usr/sbin/vserver - getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | awk '{print $2}'; fi` + getconf VROOTDIR `if [ -x "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO | grep '^ *vserver-Rootdir' | @AWK@ '{print $2}'; fi` + # canonicalize VROOTDIR + [ -z "$VROOTDIR" ] || VROOTDIR=`readlink --canonicalize $VROOTDIR` # init this library's global variables vservers_are_available=no found_vservers= @@ -41,6 +43,16 @@ init_vservers() { host_or_vservers=host # check vservers real availability if [ $vservers = yes ]; then + if [ ! -x "$VSERVERINFO" ]; then + `if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \ + "vservers enabled in $conffile, but vserver-info command was not found. Please set the VSERVERINFO configuration variable to its full path." + return + fi + if [ ! -x "$VSERVER" ]; then + `if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \ + "vservers enabled in $conffile, but vserver command was not found. Please set the VSERVER configuration variable to its full path." + return + fi if [ -z "$VROOTDIR" ]; then `if [ "$arg" = nodialog ]; then echo fatal; else echo "msgBox warning"; fi` \ "vservers enabled in $conffile, but VROOTDIR is not set and could not be guessed." @@ -51,14 +63,53 @@ init_vservers() { "vservers enabled in $conffile, but VROOTDIR ($VROOTDIR) does not exist."; return fi - found_vservers=`ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES" | tr "\n" " "` - [ -n "$found_vservers" ] || return + found_vservers=`ls $VROOTDIR | grep -E -v "lost\+found|ARCHIVES" | tr "\n" " "` + if [ -z "$found_vservers" ]; then + `if [ "$arg" = nodialog ]; then echo warning; else echo "msgBox warning"; fi` \ + "vservers enabled in $conffile, but no vserver was found in $VROOTDIR."; + return + fi vservers_are_available=yes fi } ## -## If the argument is the name of a vserver selected use by the current helper, +## If all the arguments are existing vservers names, returns 0. +## Else, returns 1. Also returns 1 if no argument is given. +## +vservers_exist() { + [ $# -ge 1 ] || return 1 + local args="$1" + local vserver i found + for vserver in $args ; do + found=no + for i in $found_vservers ; do + if [ $vserver = $i ]; then + found=yes + break + fi + done + [ $found = yes ] || return 1 + done + return 0 +} + +## +## If all the arguments are running vservers names, returns 0. +## Else, returns 1. Also returns 1 if no argument is given. +## +vservers_running() { + [ $# -ge 1 ] || return 1 + local args="$1" + local vserver + for vserver in $args ; do + $VSERVERINFO -q $vserver RUNNING || return 1 + done + return 0 +} + +## +## If the argument is the name of a vserver selected by the current helper, ## echoes 'on' and returns 0. ## Else, echoes 'off' and returns 1. ## @@ -91,9 +142,9 @@ choose_one_vserver() { while [ -z "$REPLY" ]; do [ -n "$selected_vservers" ] && setDefault $selected_vservers listBegin "$title" "Choose at least one Linux-Vserver to backup:" - for vserver in $found_vservers; do - listItem "$vserver" "Backup $vserver vserver" - done + for vserver in $found_vservers; do + listItem "$vserver" "Backup $vserver vserver" + done listDisplay menu [ $? = 0 ] || return 1 done @@ -101,17 +152,17 @@ choose_one_vserver() { } ## -## If Vservers are not enabled, set host_or_vservers='host' and then return +## If Vservers are not enabled, set host_or_vservers='host' and then return ## Else, have the user choose if he/she wants to perform the backup on the host ## system or on one Vserver. ## Set, respectively, $host_or_vservers to 'host' or 'vservers'. ## Returns 1 if cancelled. ## choose_host_or_one_vserver() { - if [ "$vservers_are_available" != "yes" ] + if [ "$vservers_are_available" != "yes" ] then - host_or_vservers='host' - return + host_or_vservers='host' + return fi local title=$1 # if there is one, set the previously chosen item as the default @@ -122,11 +173,11 @@ choose_host_or_one_vserver() { [ $? = 0 ] || return 1 case $REPLY in "host") - host_or_vservers='host' - ;; + host_or_vservers='host' + ;; "vserver") - host_or_vservers='vservers' - ;; + host_or_vservers='vservers' + ;; esac } @@ -140,10 +191,10 @@ choose_host_or_one_vserver() { ## Returns 1 if cancelled. ## choose_host_or_vservers_or_both() { - if [ "$vservers_are_available" != "yes" ] + if [ "$vservers_are_available" != "yes" ] then - host_or_vservers='host' - return + host_or_vservers='host' + return fi local title=$1 # if there is one, set the previously chosen item as the default @@ -155,14 +206,14 @@ choose_host_or_vservers_or_both() { [ $? = 0 ] || return 1 case $REPLY in "host") - host_or_vservers='host' - ;; + host_or_vservers='host' + ;; "vservers") - host_or_vservers='vservers' - ;; + host_or_vservers='vservers' + ;; "both") - host_or_vservers='both' - ;; + host_or_vservers='both' + ;; esac } @@ -185,13 +236,13 @@ choose_one_or_more_vservers() { local vserver_was_selected= REPLY= while [ -z "$REPLY" ]; do - listBegin "$title" "Choose at least one Linux-Vserver to backup:" - # list existing vservers, preselecting the previously selected ones - for vserver in $found_vservers; do - listItem "$vserver" "Backup $vserver vserver" `vserver_is_selected $vserver` - done - listDisplay checklist - [ $? = 0 ] || return 1 + listBegin "$title" "Choose at least one Linux-Vserver to backup:" + # list existing vservers, preselecting the previously selected ones + for vserver in $found_vservers; do + listItem "$vserver" "Backup $vserver vserver" `vserver_is_selected $vserver` + done + listDisplay checklist + [ $? = 0 ] || return 1 done # remove quotes around each vserver name selected_vservers=`echo $REPLY | tr -d '"'`