diff options
| -rw-r--r-- | perl-install/detect_devices.pm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 386b1f67d..354dfeb7c 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -611,23 +611,23 @@ sub get_xdsl_usb_devices() { } sub is_lan_interface { - # we want LAN like interfaces here (eg: ath|br|eth|fddi|plip|ra|tr|usb|wlan). - # there's also bnep%d for bluetooth, bcp%d... - # we do this by blacklisting the following interfaces: - # hso%d are created by drivers/net/usb/hso.c - # ippp|isdn|plip|ppp (initscripts suggest that isdn%d can be created but kernel sources claim not) - # ippp%d are created by drivers/isdn/i4l/isdn_ppp.c - # plip%d are created by drivers/net/plip.c - # ppp%d are created by drivers/net/ppp_generic.c + #- we want LAN like interfaces here (eg: ath|br|eth|fddi|plip|ra|tr|usb|wlan). + #- there's also bnep%d for bluetooth, bcp%d... + #- we do this by blacklisting the following interfaces: + #- hso%d are created by drivers/net/usb/hso.c + #- ippp|isdn|plip|ppp (initscripts suggest that isdn%d can be created but kernel sources claim not) + #- ippp%d are created by drivers/isdn/i4l/isdn_ppp.c + #- plip%d are created by drivers/net/plip.c + #- ppp%d are created by drivers/net/ppp_generic.c is_useful_interface($_[0]) && $_[0] !~ /^(?:hso|ippp|isdn|plip|ppp)/; } sub is_useful_interface { - # sit0 which is *always* created by net/ipv6/sit.c, thus is always created since net.agent loads ipv6 module - # wifi%d are created by 3rdparty/hostap/hostap_hw.c (pseudo statistics devices, #14523) - # wmaster%d are created by net/mac80211/ieee80211.c ("master" 802.11 device) - # ax*, rose*, nr*, bce* and scc* are Hamradio devices (#28776) + #- sit0 which is *always* created by net/ipv6/sit.c, thus is always created since net.agent loads ipv6 module + #- wifi%d are created by 3rdparty/hostap/hostap_hw.c (pseudo statistics devices, #14523) + #- wmaster%d are created by net/mac80211/ieee80211.c ("master" 802.11 device) + #- ax*, rose*, nr*, bce* and scc* are Hamradio devices (#28776) $_[0] !~ /^(?:lo|sit0|wifi|wmaster|ax|rose|nr|bce|scc)/; } @@ -642,9 +642,9 @@ sub is_wireless_interface { } sub get_all_net_devices() { - # we need both detection schemes since: - # - get_netdevices() use the SIOCGIFCONF ioctl that does not list interfaces that are down - # - /proc/net/dev does not list VLAN and IP aliased interfaces + #- we need both detection schemes since: + #- get_netdevices() use the SIOCGIFCONF ioctl that does not list interfaces that are down + #- /proc/net/dev does not list VLAN and IP aliased interfaces uniq( (map { if_(/^\s*([A-Za-z0-9:\.]*):/, $1) } cat_("/proc/net/dev")), c::get_netdevices(), |