summaryrefslogtreecommitdiff
path: root/scripts/vyatta-save-config.pl
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-07-14 18:03:43 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-07-15 11:59:04 -0500
commitb08d6b7d0cd2d62da49f3c76d220a6860240791e (patch)
treec8524034eb093c7c69648e36dd934a62b8551d74 /scripts/vyatta-save-config.pl
parente9149ec8278d5b6a11dc6fea0e85149d80cced50 (diff)
downloadvyatta-cfg-b08d6b7d0cd2d62da49f3c76d220a6860240791e.tar.gz
vyatta-cfg-b08d6b7d0cd2d62da49f3c76d220a6860240791e.zip
Bugfix 7331: Napa timeframe fix for config migration commment bug. Will investigate if this is a viable long term fix or if we want to find another way to ignore migrated comments for oxnard
(cherry picked from commit 5aeb46dbdb903a1921bd38e5bfc1acd53cd08c6a)
Diffstat (limited to 'scripts/vyatta-save-config.pl')
-rwxr-xr-xscripts/vyatta-save-config.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/vyatta-save-config.pl b/scripts/vyatta-save-config.pl
index 178eff7..51417b6 100755
--- a/scripts/vyatta-save-config.pl
+++ b/scripts/vyatta-save-config.pl
@@ -103,12 +103,13 @@ if ($mode eq 'local') {
}
select $save;
-my @show_cmd = ('cli-shell-api', 'showConfig', '--show-active-only',
- '--show-ignore-edit');
+my $show_cmd = 'cli-shell-api showConfig --show-active-only --show-ignore-edit';
if ($show_default) {
- push @show_cmd, '--show-show-defaults';
+ $show_cmd .= ' --show-show-defaults';
}
-open(my $show_fd, '-|', @show_cmd) or die 'Cannot execute config output';
+$show_cmd .= "| sed -e \'/--- CONFIGURATION COMMENTED OUT DURING MIGRATION BELOW ---/";
+$show_cmd .= ",/--- CONFIGURATION COMMENTED OUT DURING MIGRATION ABOVE ---/d\'";
+open(my $show_fd, '-|', $show_cmd) or die 'Cannot execute config output';
while (<$show_fd>) {
print;
}