From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 25 Jan 2020 21:22:26 +0000 (+0100)
Subject: networking/red: wait only for carrier if device exists
X-Git-Tag: v2.25-core141~27
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a83bcf914c9214d522d99966386c0a989c651f0f

networking/red: wait only for carrier if device exists

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 7ce0a6f470..b619836ae7 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -129,21 +129,23 @@ case "${1}" in
 			ip route add default via ${GATEWAY} dev ${DEVICE}
 			evaluate_retval
 			
-			# has carrier ?
-			if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then
-				boot_mesg -n "Wait for carrier on ${DEVICE} "
-				for (( i=30; i>1; i-- )) do
-					if [ "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then
-						break;
-					fi
-					boot_mesg -n "."
-					sleep 2
-				done
-				boot_mesg ""
+			if [ -d "/sys/class/net/${DEVICE}" ]; then
+				# has carrier ?
 				if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then
-					echo_failure
-				else
-					echo_ok
+					boot_mesg -n "Wait for carrier on ${DEVICE} "
+					for (( i=30; i>1; i-- )) do
+						if [ "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then
+							break;
+						fi
+						boot_mesg -n "."
+						sleep 2
+					done
+					boot_mesg ""
+					if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then
+						echo_failure
+					else
+						echo_ok
+					fi
 				fi
 			fi