Neue Netzwerkdialoge sind zum ersten Test verfuegbar.

[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 e3de8e6586edf33fa9ff31aeb7f27bd3d525804d..38ad71c7b1aeb32c723a41cd8c608a95f0f33834 100644 (file)
--- a/src/install+setup/install/probenic.sh
+++ b/src/install+setup/install/probenic.sh
@@ -2,16 +2,16 @@
 
 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
+               kudzu -qps -c NETWORK | egrep "desc|network.hwaddr" | \
+                               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
                        ;;
        "")
                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" | \
+                       kudzu -qps -c NETWORK | egrep "desc|network.hwaddr" | \
+                               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
                        ;;