diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-24 09:57:30 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-24 09:57:30 -0700 |
| commit | 07ac603a29d1157d0ed0d1629c2bf620b8846ef0 (patch) | |
| tree | 807ddd4efcd5ac2b22b868d3670501ef2f6cf63a /scripts | |
| parent | 510bd206970da7a8d5764f5465856952d11d6a73 (diff) | |
| parent | b6b8db9771c217c0d0347e4880f3a516029532a6 (diff) | |
| download | vyatta-cfg-07ac603a29d1157d0ed0d1629c2bf620b8846ef0.tar.gz vyatta-cfg-07ac603a29d1157d0ed0d1629c2bf620b8846ef0.zip | |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg into islavista
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/VyattaConfigLoad.pm | 1 | ||||
| -rwxr-xr-x | scripts/VyattaConfigOutput.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index b1b7598..5305dc8 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -35,6 +35,7 @@ my %config_rank = ( 'system host-name' => 1005, 'interfaces' => 1000, 'interfaces bridge' => 990, + 'interfaces bonding' => 995, 'interfaces ethernet' => 980, 'interfaces tunnel' => 910, 'system gateway-address' => 890, diff --git a/scripts/VyattaConfigOutput.pm b/scripts/VyattaConfigOutput.pm index 1933d22..fa0b274 100755 --- a/scripts/VyattaConfigOutput.pm +++ b/scripts/VyattaConfigOutput.pm @@ -75,7 +75,7 @@ sub displayValues { $default = $txt; } } - my $is_password = ($name =~ /^.*password$/); + my $is_password = ($name =~ /^.*(password|pre-shared-secret)$/); my $HIDE_PASSWORD = '****************'; $config->setLevel(join ' ', @cur_path); if ($is_multi) { |