aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2006-01-19 21:57:37 +0000
committerintrigeri <intrigeri@boum.org>2006-01-19 21:57:37 +0000
commita99d05982d166c4bc455ef56773e93b8a558801f (patch)
tree2d3628c772bce5fe2d4b667b3179f6e73fb92b7b
parentb7dd0cbf8138bb02b5309ac98db10705ab40312e (diff)
downloadbackupninja-a99d05982d166c4bc455ef56773e93b8a558801f.tar.gz
backupninja-a99d05982d166c4bc455ef56773e93b8a558801f.tar.bz2
homogeneized rdiff.helper, dup.helper and example.dup doc about vsnames and vsinclude
-rw-r--r--examples/example.dup11
-rw-r--r--handlers/dup.helper13
-rw-r--r--handlers/rdiff.helper10
3 files changed, 20 insertions, 14 deletions
diff --git a/examples/example.dup b/examples/example.dup
index 52aea17..50d9572 100644
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -84,12 +84,15 @@ include = /var/lib/dpkg/status-old
# be used:
# vsnames = all | <vserver1> <vserver2> ... (default = all)
# vsinclude = <path>
+# vsinclude = <path>
+# ...
# Any path specified in vsinclude is added to the include list for each vserver
# listed in vsnames (or all if vsnames = all).
-# E.g. vsinclude = /home will backup the /home partition in every vserver
-# listed in vsnames. If you have 'vsnames = foo bar baz', this vsinclude will
-# add to the include list /vservers/foo/home, /vservers/bar/home and
-# /vservers/baz/home.
+#
+# For example, vsinclude = /home will backup the /home directory in every
+# vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
+# vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
+# and /vservers/baz/home.
# Vservers paths are derived from $VROOTDIR.
# rdiff-backup specific comment, TO ADAPT
diff --git a/handlers/dup.helper b/handlers/dup.helper
index a95bf35..f241334 100644
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -33,7 +33,7 @@ do_dup_vserver() {
# choose the files to backup
REPLY=
while [ -z "$REPLY" ]; do
- formBegin "$dup_title - vservers: includes"
+ formBegin "$dup_title - vservers: vsincludes (backup these directories from every selected vserver)"
[ -z "$dup_vsincludes" ] && dup_vsincludes="$dup_default_includes"
for i in $dup_vsincludes; do
formItem include "$i"
@@ -351,12 +351,15 @@ EOF
# be used:
# vsnames = all | <vserver1> <vserver2> ... (default = all)
# vsinclude = <path>
+# vsinclude = <path>
+# ...
# Any path specified in vsinclude is added to the include list for each vserver
# listed in vsnames (or all if vsnames = all).
-# E.g. vsinclude = /home will backup the /home partition in every vserver
-# listed in vsnames. If you have 'vsnames = foo bar baz', this vsinclude will
-# add to the include list /vservers/foo/home, /vservers/bar/home and
-# /vservers/baz/home.
+#
+# For example, vsinclude = /home will backup the /home directory in every
+# vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
+# vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
+# and /vservers/baz/home.
# Vservers paths are derived from $VROOTDIR.
EOF
diff --git a/handlers/rdiff.helper b/handlers/rdiff.helper
index 80340f7..c21c5b5 100644
--- a/handlers/rdiff.helper
+++ b/handlers/rdiff.helper
@@ -291,11 +291,11 @@ EOF
# Any path specified in vsinclude is added to the include list for each vserver
# listed in vsnames (or all if vsnames = all).
#
-# For example, vsinclude = /home will backup the /home partition in every
-# vserver listed in vsnames. If you have vsnames = "foo bar baz", this
-# vsinclude will add to the include list /vservers/foo/home,
-# /vservers/bar/home and /vservers/baz/home.
-# Vserver paths are derived from $VROOTDIR.
+# For example, vsinclude = /home will backup the /home directory in every
+# vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
+# vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
+# and /vservers/baz/home.
+# Vservers paths are derived from $VROOTDIR.
EOF
set -o noglob