From 36ea15e7d9119a19f3541ca16a2b4f13efc8dac7 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@slioch.vyatta.com>
Date: Tue, 25 May 2010 09:52:45 -0700
Subject: final fix for 5610. fixes loading where node in active config is
 deactivated and is active in loaded configuration.

---
 lib/Vyatta/ConfigLoad.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/Vyatta/ConfigLoad.pm')

diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm
index 183e598..033aec0 100755
--- a/lib/Vyatta/ConfigLoad.pm
+++ b/lib/Vyatta/ConfigLoad.pm
@@ -405,10 +405,14 @@ sub getConfigDiff {
     }
   }
 
+  #let's get active disable nodes
+  my @enable_list = $active_cfg->getAllDeactivated("");;
+
   my %diff = (
               'delete' => \@new_delete_list,
               'set' => \@set_list,
               'deactivate' => \@disable_list,
+              'activate' => \@enable_list,
               'comment' => \@comment_list,
              );
   return %diff;
-- 
cgit v1.2.3