Merge branch 'origin/xen'

[people/pmueller/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 5008def61777c13f01e6b0f9d21106ec5bcfff4f..296eb7c6a3612ea02c86ec0723f54df975afa66d 100644 (file)
--- a/src/install+setup/install/probenic.sh
+++ b/src/install+setup/install/probenic.sh
@@ -1,16 +1,27 @@
 #!/bin/sh
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
-MODULES=$(/bin/kudzu -qps  -t 30 -c NETWORK | grep driver | cut -d ' ' -f 2 | sort)
+kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
 
-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
+# Revert Accesspoint marking at mac address
+sed -i 's|hwaddr: 06:|hwaddr: 00:|g' /var/ipfire/ethernet/scanned_nics
 
-if [ "$NUMBER" ]; then
-       echo "$(echo $MODULES | grep -n $NUMBER | cut -c 1-2 )" > /nicdriver
-else
-       echo "$MODULES" > /nicdriver
-fi
+exit 0