From a2be0181a81adfca6f8fdf7c9b6190244c7146e2 Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Thu, 10 Jul 2008 13:37:49 -0700 Subject: Revert "fix for bug 3441. Removed def from listOutputNodes(), which allowed other code that filters out def file to be removed." Need to spend more time with this fix--'def' is used in locations to suppress non-user specified default values. will reapply revised fix after a bit more vetting. This reverts commit 42d6c942800e2273b77ea92371ffdcb3f183163f. --- scripts/VyattaConfigLoad.pm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/VyattaConfigLoad.pm') diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index c8563bb..1a7f26e 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -297,6 +297,9 @@ sub findDeletedNodes { $active_cfg->setLevel(join ' ', @active_path); my @active_nodes = $active_cfg->listOrigNodes(); foreach (@active_nodes) { + if ($_ eq 'def') { + next; + } if ($_ eq 'node.val') { findDeletedValues($new_ref, \@active_path); next; -- cgit v1.2.3