From: intrigeri Date: Tue, 17 Jan 2006 22:22:07 +0000 (+0000) Subject: dup.helper: fixed output syntax for multiple vsnames X-Git-Tag: backupninja-0.9.3~37 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=38642e9c0f902e3d7de1fa1154a9561ed0ef042c;p=matthijs%2Fupstream%2Fbackupninja.git dup.helper: fixed output syntax for multiple vsnames example.dup: fixed example vsnames syntax --- diff --git a/ChangeLog b/ChangeLog index 6c79608..03da8f7 100644 --- 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 + . 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 diff --git a/examples/example.dup b/examples/example.dup index 1e788b9..52aea17 100644 --- 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 -# 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. diff --git a/handlers/dup.helper b/handlers/dup.helper index a439e67..a95bf35 100644 --- 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 -# 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. @@ -363,7 +363,7 @@ EOF 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