dup.helper: fixed output syntax for multiple vsnames

example.dup: fixed example vsnames syntax

diff --git a/ChangeLog b/ChangeLog
index 6c796088d4788ce757117ec886b5991fdc17f919..03da8f71ea7252dbc1f3976ae78ecbc4a299ea31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ version 0.9.3 -- unreleased
           #348022, follow-up to #338796)
         . warn if vsnames or vsinclude is enabled while vservers support is
           disabled in backupninja.conf
           #348022, follow-up to #338796)
         . warn if vsnames or vsinclude is enabled while vservers support is
           disabled in backupninja.conf

+        . now works when multiple vservers names are given (separated by space)
+          in vsnames config variable

     ninjahelper changes
         rdiff.helper:
          . fixed errors in create remote dir
     ninjahelper changes
         rdiff.helper:
          . fixed errors in create remote dir

diff --git a/examples/example.dup b/examples/example.dup
index 1e788b9df2e020f22bd3e3dcffbbfd6b25335a6b..52aea1781608f749d85c5fbc9c12577d68fdad79 100644 (file)
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -87,7 +87,7 @@ include = /var/lib/dpkg/status-old
 # 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
 # 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
+# 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.
 # add to the include list /vservers/foo/home, /vservers/bar/home and
 # /vservers/baz/home.
 # Vservers paths are derived from $VROOTDIR.

diff --git a/handlers/dup.helper b/handlers/dup.helper
index a439e67a79367b0db270e1afc57d9cd4baee32d9..a95bf3516501e63782b07592fc246a1c3849423c 100644 (file)
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -354,7 +354,7 @@ EOF
 # 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
 # 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
+# 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.
 # add to the include list /vservers/foo/home, /vservers/bar/home and
 # /vservers/baz/home.
 # Vservers paths are derived from $VROOTDIR.


@@ -363,7 +363,7 @@ EOF
 
    if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ]; then
       set -o noglob
 
    if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ]; then
       set -o noglob

-      echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename
+      echo -e "vsnames = $selected_vservers\n" >> $next_filename

       for i in $dup_vsincludes; do
          echo "vsinclude = $i" >> $next_filename
       done
       for i in $dup_vsincludes; do
          echo "vsinclude = $i" >> $next_filename
       done