Commit 7dacaea1 authored by Ryan Jackson's avatar Ryan Jackson

This fix is cleaner than the last one. Just make sure the ifconfig

output contains 'encap:Ethernet'.
parent f54359c5
......@@ -27,19 +27,7 @@ IFACETYPES="3c59x e100 e1000 tulip e1000e tg3"
#
modprobe -qa $IFACETYPES
interfaces=''
if [ -d /sys/class/net ]; then
for d in /sys/class/net/*; do
[ -f $d/type ] || continue
# Type 1 is Ethernet. dhclient only supports
# type 1.
if [ `cat $d/type` = 1 ]; then
interfaces="$interfaces ${d##*/}"
fi
done
else
interfaces=`ifconfig -a -s | sed '1d;/^lo /d;/^wmaster/d;s/ .*$//'`
fi
interfaces=`ifconfig -a | sed -n 's/^\([^ ]*\).*encap:Ethernet.*$/\1/p'`
#
# Check: are we a remote node? If so, possibly try static config in pref
......
......@@ -26,19 +26,7 @@ IFACETYPES="3c59x eepro100 e1000 r8169 tulip"
#
modprobe -qa $IFACETYPES
interfaces=''
if [ -d /sys/class/net ]; then
for d in /sys/class/net/*; do
[ -f $d/type ] || continue
# Type 1 is Ethernet. dhclient only supports
# type 1.
if [ `cat $d/type` = 1 ]; then
interfaces="$interfaces ${d##*/}"
fi
done
else
interfaces=`ifconfig -a -s | sed '1d;/^lo /d;/^wmaster/d;s/ .*$//'`
fi
interfaces=`ifconfig -a | sed -n 's/^\([^ ]*\).*encap:Ethernet.*$/\1/p'`
#
# If dhclient returns success, then it has configured the first interface
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment