Korrekturen bei der Erkennung der Netzwerkkarten am Installer vorgenommen.

[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 13e703360ae54afd90fdcc6768f7bed1f53919f9..c09ac16e1490fab9fdd7129e2fa429729c9d8d31 100644 (file)
--- a/src/install+setup/install/probenic.sh
+++ b/src/install+setup/install/probenic.sh
@@ -2,18 +2,10 @@
 
 case "$1" in
        install)
-               kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" | \
-                               awk -F": " '{ print $2";" }' | sed -e '/..:..:..:..:..:..;/a\X' | \
-                               tr "\n" "X" | sed -e 's/XXX/\n/g' -e 's/;X/;/g' | \
-                               sort > /tmp/scanned_nics 2>/dev/null
+               kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /tmp/scanned_nics 2>/dev/null
                        ;;
        "")
-               if [ ! -e /var/ipfire/ethernet/scan_lock ]; then
-                       kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" | \
-                               awk -F": " '{ print $2";" }' | sed -e '/..:..:..:..:..:..;/a\X' | \
-                               tr "\n" "X" | sed -e "s/XXX/\n/g" -e 's/;X/;/g' | \
-                               sort > /var/ipfire/ethernet/scanned_nics 2>/dev/null
-               fi
+               kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
                        ;;
 esac
 exit 0