[Fai-commit] r3429 - trunk/lib

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-18 15:37:25 +0000 (Tue, 18 Apr 2006)
New Revision: 3429

Modified:
   trunk/lib/get-boot-info
Log:
do not try to activate the first four ethernet devices


Modified: trunk/lib/get-boot-info
===================================================================
--- trunk/lib/get-boot-info	2006-04-18 15:00:07 UTC (rev 3428)
+++ trunk/lib/get-boot-info	2006-04-18 15:37:25 UTC (rev 3429)
@@ -48,17 +48,10 @@
 
     # some network driver do not echo eth0,..; they are not detected
     netdevices_all=$(dmesg| perl -ne 'print $&,"\n" if m/\beth[0-9]\b/')
-
-    # another way to determine the first four ethernet devices
-    local dev devices
-    devices=$(seq 0 1 4)
-    for dev in $devices; do
-        ifconfig eth$dev up 2>/dev/null && netdevices_all="$netdevices_all eth$dev"
-    done
+    tmp=$(ifconfig -a | grep ^eth | awk '{ print $1 }')
+    netdevices_all="$netdevices_all $tmp"
     netdevices_all=$(for dev in $netdevices_all; do echo $dev; done| sort | uniq)
 
-#    netdevices_all=$(echo $netdevices_all | sort | uniq)
-
     cat > $bootlog <<-EOF
 	netdevices_all="$netdevices_all"
 	netdevices_up="$netdevices_up"