diff --git a/examples/example.dup b/examples/example.dup index 52aea1781608f749d85c5fbc9c12577d68fdad79..50d957291247e63ea0cd5d498ab8791610a078b4 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 a95bf3516501e63782b07592fc246a1c3849423c..f2413344f00fbb733a66808a00a377167730c330 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 80340f7ddaa81a5bfde636a977e480f35c201432..c21c5b584ea819adfccbef017186d0a3c0ce7fad 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