more fine tuning for usb detection

This commit is contained in:
inxi-svn 2011-04-30 22:32:39 +00:00
parent 4b02755df7
commit 8ca542bf1a

7
inxi
View file

@ -465,7 +465,10 @@ BAN_LIST_CPU=''
### USB networking search string data, because some brands can have other products than ### USB networking search string data, because some brands can have other products than
### wifi/nic cards, they need further identifiers, with wildcards. ### wifi/nic cards, they need further identifiers, with wildcards.
USB_NETWORK_SEARCH="AirLink.*Wireless Atmel Belkin.*Wireless Belkin.*WLAN Belkin.*Network Buffalo.*Wireless D-Link.*Adapter D-Link.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless ENUWI-.*Wireless LG.*Wi-Fi Linksys Netgear Realtek.*Network Realtek.*Wireless Realtek.*WLAN Rosewill.*Wireless RNX-.Wireless Samsung.*LinkStick Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless WG[0-9]{3}.*Wireless WNA[0-9]{3} WNDA[0-9]{3} Zonet.*ZEW.*Wireless Wi-Fi.*Adapter Wireless.*Adapter WLAN.*Adapter" USB_NETWORK_SEARCH="AirLink.*Wireless Atmel Belkin.*Wireless Belkin.*WLAN Belkin.*Network Buffalo.*Wireless D-Link.*Adapter D-Link.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless ENUWI-.*Wireless LG.*Wi-Fi Linksys Netgear Ralink Realtek.*Network Realtek.*Wireless Realtek.*WLAN Rosewill.*Wireless RNX-.Wireless Samsung.*LinkStick Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless WG[0-9]{3}.*Wireless WNA[0-9]{3} WNDA[0-9]{3} Zonet.*ZEW.*Wireless Wi-Fi.*Adapter Wireless.*Adapter WLAN.*Adapter"
# then a few known hard to ID ones added
# belkin=050d; netgear=0846; ralink=148f; realtek=0bda;
USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH 050d:935b 0bda:8189 0bda:8197"
# WARNING: In the main part below (search for 'KONVI') # WARNING: In the main part below (search for 'KONVI')
# there's a check for Konversation-specific config files. # there's a check for Konversation-specific config files.
@ -3337,7 +3340,7 @@ get_networking_data()
lsusb_data="$( $lsusb_path 2>/dev/null )" lsusb_data="$( $lsusb_path 2>/dev/null )"
for needle in $USB_NETWORK_SEARCH for needle in $USB_NETWORK_SEARCH
do do
if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" | grep -isv 'bluetooth' ) ]];then if [[ -n $( grep -isE "$needle" <<< "$lsusb_data" | grep -Eisv '(bluetooth| hub|keyboard|mouse' ) ]];then
card_data=$( grep -isE "$needle" <<< "$lsusb_data" ) card_data=$( grep -isE "$needle" <<< "$lsusb_data" )
fi fi
done done