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)

2 files changed, 7 insertions, 4 deletions

diff --git a/etc/bash_completion.d/vyatta-cfg b/etc/bash_completion.d/vyatta-cfg
index 01b2a13..776c56b 100755
--- a/etc/bash_completion.d/vyatta-cfg
+++ b/etc/bash_completion.d/vyatta-cfg
@@ -98,6 +98,8 @@ show ()
     fi
   done
   cli-shell-api "${opts[@]}" -- showCfg "${args[@]}" \
+    | sed -e '/--- CONFIGURATION COMMENTED OUT DURING MIGRATION BELOW ---/\
+             ,/--- CONFIGURATION COMMENTED OUT DURING MIGRATION ABOVE ---/d'\
     | eval "${VYATTA_PAGER:-cat}"
 }
 
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;
 }