diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2011-01-26 14:24:13 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2011-01-26 15:42:59 -0800 |
| commit | 7f700d26fb0f13a42445c34459380a68a57a8a1d (patch) | |
| tree | 5a022f6ce611cf7cfd09c847b1240c5991e12063 | |
| parent | 040ab3a8aa00b7d9650836325d20e98ac304773d (diff) | |
| download | vyatta-cfg-system-7f700d26fb0f13a42445c34459380a68a57a8a1d.tar.gz vyatta-cfg-system-7f700d26fb0f13a42445c34459380a68a57a8a1d.zip | |
Fix vrrp duplicate generation of last sync-group entry.
(cherry picked from commit 8529fbe7ed23023e936f5c7cab9663007d0476d3)
| -rwxr-xr-x | scripts/keepalived/vyatta-keepalived.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl index 9b8358d2..7a113469 100755 --- a/scripts/keepalived/vyatta-keepalived.pl +++ b/scripts/keepalived/vyatta-keepalived.pl @@ -391,11 +391,12 @@ sub remove_from_changes { sub vrrp_update_config { my @errs = (); - my $output = "#\n# autogenerated by $0\n#\n\n"; + my $output; my $config = new Vyatta::Config; my $vrrp_instances = 0; + %HoA_sync_groups = (); foreach my $name ( getInterfaces() ) { my $intf = new Vyatta::Interface($name); next unless $intf; @@ -427,6 +428,7 @@ sub vrrp_update_config { if ( defined $sync_groups && $sync_groups ne "" ) { $output = $sync_groups . $output; } + $output = "#\n# autogenerated by $0\n#\n\n" . $output; keepalived_write_file( $conf_file, $output ); } return ( $vrrp_instances, @errs ); |