aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2005-12-27 22:13:01 +0000
committerMicah Anderson <micah@riseup.net>2005-12-27 22:13:01 +0000
commitbdc92b87e77ecb0eebda304ec32a3d41e8783cdd (patch)
tree4a28fdecc8d9df4e47431b0b4560d89feca3c5f9
parent104b663a9d6807b7fdcaf06816c08ed746e38ac2 (diff)
downloadbackupninja-bdc92b87e77ecb0eebda304ec32a3d41e8783cdd.tar.gz
backupninja-bdc92b87e77ecb0eebda304ec32a3d41e8783cdd.tar.bz2
r240@um: micah | 2005-12-27 14:54:04 -0500
If vservers weren't enabled it was impossible to enter the src menu in ninjahelper due to how these functions returned. This sets the variable host_or_vserver='host' when vservers are not available and then returns with a nice exit code
-rw-r--r--lib/vserver.in16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/vserver.in b/lib/vserver.in
index 4c62291..8d89e88 100644
--- a/lib/vserver.in
+++ b/lib/vserver.in
@@ -88,14 +88,18 @@ choose_one_vserver() {
}
##
-## If Vservers are not enabled, exit silently.
+## 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() {
- [ "$vservers_are_available" == "yes" ] || return
+ if [ "$vservers_are_available" != "yes" ]
+ then
+ host_or_vservers='host'
+ return
+ fi
local title=$1
# if there is one, set the previously chosen item as the default
[ -n "$host_or_vservers" ] && setDefault $host_or_vservers
@@ -114,7 +118,7 @@ choose_host_or_one_vserver() {
}
##
-## If Vservers are not enabled, exit silently.
+## If Vservers are not enabled, set host_or_vservers='host' and then return
## Else, have the user choose the target he/she wants to perform the backup on:
## - host system only;
## - some vservers only;
@@ -123,7 +127,11 @@ choose_host_or_one_vserver() {
## Returns 1 if cancelled.
##
choose_host_or_vservers_or_both() {
- [ "$vservers_are_available" == "yes" ] || return
+ if [ "$vservers_are_available" != "yes" ]
+ then
+ host_or_vservers='host'
+ return
+ fi
local title=$1
# if there is one, set the previously chosen item as the default
[ -n "$host_or_vservers" ] && setDefault $host_or_vservers