diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-08-20 13:44:50 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-08-20 13:44:50 -0700 |
| commit | be84d74f900c98004fdaa6d4fc0baa749422f7cc (patch) | |
| tree | 24eedfebc9f36515bdd7dedbd889b364bf6a38c7 | |
| parent | c0a47925dd8afe91a694fa20d2e65e986974ac79 (diff) | |
| parent | b21ed5d3b9df3b347c2efd8341fb042469a3aaee (diff) | |
| download | vyatta-cfg-be84d74f900c98004fdaa6d4fc0baa749422f7cc.tar.gz vyatta-cfg-be84d74f900c98004fdaa6d4fc0baa749422f7cc.zip | |
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg into kenwood
| -rwxr-xr-x | lib/Vyatta/Misc.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm index 091e49f..6089361 100755 --- a/lib/Vyatta/Misc.pm +++ b/lib/Vyatta/Misc.pm @@ -96,12 +96,13 @@ sub generate_dhclient_intf_files { # get list of interfaces on the system via sysfs # skip dot files (and any interfaces name .xxx) # and bond_masters file used by bonding -# and pseudo-interface wmaster used by wireless (will disappear in 2.6.32) +# and wireless control interfaces sub getInterfaces { opendir( my $sys_class, '/sys/class/net' ) or die "can't open /sys/class/net: $!"; my @interfaces = grep { ( !/^\./ ) && ( $_ ne 'bonding_masters' ) && + ! ( $_ =~ '^mon.wlan\d$') && ! ( $_ =~ '^wmaster\d+$') } readdir $sys_class; closedir $sys_class; |