Wir kehren zurueck zu Kudzu, da hwinfo noch mehr Aerger macht.

[people/teissler/ipfire-2.x.git] / src / install+setup / install / probenic.sh

diff --git a/src/install+setup/install/probenic.sh b/src/install+setup/install/probenic.sh
index 42b1ea4265bd7017cd25e457eb38c104b9ed3cd6..e3de8e6586edf33fa9ff31aeb7f27bd3d525804d 100644 (file)
--- a/src/install+setup/install/probenic.sh
+++ b/src/install+setup/install/probenic.sh
@@ -1,18 +1,19 @@
 #!/bin/sh
 
-MODULES=$(/bin/kudzu -qps  -t 30 -c NETWORK | grep driver | cut -d ' ' -f 2 | sort)
-
-if [ "$1" == "count" ]; then
-       /bin/kudzu -qps  -t 30 -c NETWORK | grep driver | wc -l | awk '{ print $1 }' > /drivercount
-       exit 0
-else
-       NUMBER=$1
-fi
-
-if [ "$NUMBER" ]; then
-       echo "$(echo $MODULES | grep -n $NUMBER | cut -c 1-2 )" > /nicdriver
-else
-       echo "$MODULES" > /nicdriver
-fi
-
-#  kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" | awk -F': ' '{print $2}' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g"
+case "$1" in
+       install)
+               hwinfo --netcard | egrep "Model|HW Address" | \
+                       awk -F": " '{ print $2 }' | sed -e '/..:..:..:..:..:../a\\' | sed -e "s/$/\;/g" | \
+                       tr "\n" "XX" | sed -e "s/XX/\n/g" | sed -e "s/\;X/\;/g" | \
+                       sort > /tmp/scanned_nics 2>/dev/null
+                       ;;
+       "")
+               if [ ! -e /var/ipfire/ethernet/scan_lock ]; then
+                       hwinfo --netcard | egrep "Model|HW Address" | \
+                               awk -F": " '{ print $2 }' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" | \
+                               tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | \
+                               sort > /var/ipfire/ethernet/scanned_nics 2>/dev/null
+               fi
+                       ;;
+esac
+exit 0