diff options
Diffstat (limited to 'bin/arancid.in')
| -rw-r--r--[-rwxr-xr-x] | bin/arancid.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/arancid.in b/bin/arancid.in index f27e2ec..f51a6c3 100755..100644 --- a/bin/arancid.in +++ b/bin/arancid.in @@ -174,6 +174,9 @@ sub WriteTerm { defined($ENV{'NOCOMMSTR'})) { ProcessHistory("","","","\/\*\t$1$2\"<removed>\"\n") && next; } + /^(\s+.{2,3}pw )\S+/ && + ProcessHistory("","","","\/\*$1<removed>\n") && next; + next if (/^\/\* Configuration dump taken/i); next if (/^\/\* Version.*Base MAC.*/i); @@ -240,7 +243,7 @@ TOP: while(<INPUT>) { if (!defined($prompt)) {$prompt = ($_ =~ /^([^#]+#)/)[0]; } print STDERR ("HIT COMMAND:$_") if ($debug); if (!defined($commands{$cmd})) { - print STDERR "found unexpected command - \"$cmd\"\n"; + print STDERR "$host: found unexpected command - \"$cmd\"\n"; $clean_run = 0; last TOP; } @@ -266,12 +269,12 @@ if (defined($ENV{NOPIPE})) { # check for completeness if (scalar(%commands) || !$clean_run || !$found_end) { if (scalar(%commands)) { - printf(STDOUT "missed cmd(s): %s\n", join(',', keys(%commands))); - printf(STDERR "missed cmd(s): %s\n", join(',', keys(%commands))) if ($debug); + printf(STDOUT "$host: missed cmd(s): %s\n", join(',', keys(%commands))); + printf(STDERR "$host: missed cmd(s): %s\n", join(',', keys(%commands))) if ($debug); } if (!$clean_run || !$found_end) { - print STDOUT "End of run not found\n"; - print STDERR "End of run not found\n" if ($debug); + print STDOUT "$host: End of run not found\n"; + print STDERR "$host: End of run not found\n" if ($debug); system("/usr/bin/tail -1 $host.new"); } unlink "$host.new" if (! $debug); |