From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 1 Oct 2009 18:28:48 +0000 (+0200)
Subject: Add default probenic output if driver doesnt export bus/name
X-Git-Tag: v2.9-beta1~713
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9a0b3f02cc324b2a17fb85141a230b719d5d4f82;ds=sidebyside

Add default probenic output if driver doesnt export bus/name
Fix some output formating (remove usb vendor id)
---

diff --git a/src/install+setup/install/probenic.sh b/src/install+setup/install/probenic.sh
index fcec6bd23b..f8ab7e114e 100644
--- a/src/install+setup/install/probenic.sh
+++ b/src/install+setup/install/probenic.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -36,13 +36,21 @@ for card in `ls /sys/class/net`; do
 
 			driver=`grep PHYSDEVDRIVER= /sys/class/net/$card/uevent | cut -d"=" -f2`
 			type=`grep PHYSDEVBUS= /sys/class/net/$card/uevent | cut -d"=" -f2`
+
+			#Default if not avaiable in /sys/class/net
+			if [ "a$type" == "a" ]; then
+				type="???"
+			fi
+			if [ "a$driver" == "a" ]; then
+				driver="Unknown Network card"
+			fi
 			description=`echo $type: $driver`
 
 			#Get more details for pci and usb devices
 			if [ "$type" == "pci" ]; then
 				slotname=`grep PCI_SLOT_NAME= /sys/class/net/$card/device/uevent | cut -d"=" -f2`
-				name=`lspci -s $slotname | cut -d':' -f3`
-				description=`echo $type:$name`
+				name=`lspci -s $slotname | cut -d':' -f3 | cut -c 2-`
+				description=`echo $type: $name`
 			fi
 			if [ "$type" == "usb" ]; then
 				bus=`grep DEVICE= /sys/class/net/$card/device/uevent | cut -d"/" -f5`
@@ -50,7 +58,7 @@ for card in `ls /sys/class/net`; do
 				#work around the base8 convert
 				let bus=`echo 1$bus`-1000
 				let dev=`echo 1$dev`-1000
-				name=`lsusb -s $bus:$dev | cut -d':' -f3`
+				name=`lsusb -s $bus:$dev | cut -d':' -f3 | cut -c 6-`
 				description=`echo $type: $name`
 			fi