[patch] net_eth0-fix-carrier-detection.patch

net_eth0-fix-carrier-detection.patch (text/plain), 1.37 KB, created by Martin Schlemmer (RETIRED) on 2003-11-16 12:05:48 UTC

Index: init.d/net.eth0
===================================================================
RCS file: /home/cvsroot/gentoo-src/rc-scripts/init.d/net.eth0,v
retrieving revision 1.32
diff -u -r1.32 net.eth0
--- init.d/net.eth0	11 Nov 2003 19:37:24 -0000	1.32
+++ init.d/net.eth0	16 Nov 2003 20:02:07 -0000
@@ -32,8 +32,7 @@
 	dhcpcd_IFACE="$(eval echo \$\{dhcpcd_${iface}\})"
 	inet6_IFACE="$(eval echo \$\{inet6_${iface}\})"
 	alias_IFACE="$(eval echo \$\{alias_${iface}\})"
-	status_IFACE="$(ifconfig | gawk -v IFACE="${iface}" '/Link/ { if ($1 == IFACE) print "up" }')"
-	carrier_IFACE="$(ifconfig | gawk -v IFACE="${iface}" '/RUNNING/ { if ($1 == IFACE) print "running" }')"
+	status_IFACE="$(ifconfig | gawk -v IFACE="${iface}" '$0 ~ /Link/ { if ($1 == IFACE) print "up" }')"
 	vlans="$(eval echo \$\{iface_${IFACE}_vlans\})"
 }
 
@@ -62,8 +61,15 @@
 		# Check that eth0 was not brough up by the kernel ...
 		if [ "${status_IFACE}" != "up" ]
 		then
+			# The interface has to be up before we can check
+			# that it has a carrier ...
+			/sbin/ifconfig ${IFACE} up >/dev/null || {
+				retval=$?
+				eend ${retval} "Failed to bring ${IFACE} up"
+				return ${retval}
+			}
 			# Check that the interface has a carrier
-			if [ "${carrier_IFACE}" = "running" ]
+			if ifconfig ${IFACE} | grep -qc 'RUNNING' &>/dev/null
 			then
 				/sbin/dhcpcd ${dhcpcd_IFACE} ${IFACE} >/dev/null || {
 					retval=$?