aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--handlers/dup3
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 248ea97..6c79608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ version 0.9.3 -- unreleased
duplicity:
. fixed (again...) globbing in include and exclude options (Debian bug
#348022, follow-up to #338796)
+ . warn if vsnames or vsinclude is enabled while vservers support is
+ disabled in backupninja.conf
ninjahelper changes
rdiff.helper:
. fixed errors in create remote dir
diff --git a/handlers/dup b/handlers/dup
index 2e4312b..5970694 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -57,6 +57,9 @@ if [ "$vservers" == "yes" ]; then
else
[ -z "$vsinclude" ] || warning 'vsnames is empty, vsinclude configuration lines will be ignored'
fi
+else
+ [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
+ [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'
fi
### see if we can login ###