Attachment 164165 Details for Bug 205263 – netwait fix patch r3

[patch] netwait fix patch r3

netwait-fix-r3.patch (text/plain), 3.27 KB, created by Brendan Molloy on 2015-12-12 23:40:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Molloy

Created: 2015-12-12 23:40:59 UTC

Size: 3.27 KB

patch

obsolete

>Index: etc/rc.d/NETWORKING
>===================================================================
>--- etc/rc.d/NETWORKING	(revision 292127)
>+++ etc/rc.d/NETWORKING	(working copy)
>@@ -4,7 +4,7 @@
> #
> 
> # PROVIDE: NETWORKING NETWORK
>-# REQUIRE: netif netoptions routing ppp ipfw stf
>+# REQUIRE: netif netwait netoptions routing ppp ipfw stf
> # REQUIRE: defaultroute routed route6d mroute6d resolv bridge
> # REQUIRE: static_arp static_ndp
> 
>Index: etc/rc.d/netwait
>===================================================================
>--- etc/rc.d/netwait	(revision 292127)
>+++ etc/rc.d/netwait	(working copy)
>@@ -3,7 +3,7 @@
> # $FreeBSD$
> #
> # PROVIDE: netwait
>-# REQUIRE: NETWORKING
>+# REQUIRE: routing
> # KEYWORD: nojail
> #
> # The netwait script is intended to be used by systems which have
>@@ -23,8 +23,8 @@
> {
> 	local ip rc count output link
> 
>-	if [ -z "${netwait_ip}" ]; then
>-		err 1 "You must define one or more IP addresses in netwait_ip"
>+	if [ -z "${netwait_if}" ] && [ -z "${netwait_ip}" ]; then
>+		err 1 "No interface or IP addresses listed, nothing to wait for"
> 	fi
> 
> 	if [ ${netwait_timeout} -lt 1 ]; then
>@@ -31,21 +31,21 @@
> 		err 1 "netwait_timeout must be >= 1"
> 	fi
> 
>-	# Handle SIGINT (Ctrl-C); force abort of while() loop
>-	trap break SIGINT
>-
> 	if [ -n "${netwait_if}" ]; then
>-		echo -n "Waiting for $netwait_if to have link"
>+		echo "Waiting for $netwait_if to have link."
> 
>+		# Handle SIGINT (Ctrl-C); force abort of while() loop
>+		trap break SIGINT
>+
> 		count=1
> 		while [ ${count} -le ${netwait_if_timeout} ]; do
> 			if output=`/sbin/ifconfig ${netwait_if} 2>/dev/null`; then
> 				link=`expr "${output}" : '.*[[:blank:]]status: $no carrier$'`
> 				if [ -z "${link}" ]; then
>-					echo '.'
>+					echo "Link acquired for $netwait_if."
> 					break
> 				fi
>-			else
>+			elif [ ${count} -eq ${netwait_if_timeout} ]; then
> 				echo ''
> 				err 1 "ifconfig ${netwait_if} failed"
> 			fi
>@@ -64,34 +64,36 @@
> 		fi
> 	fi
> 
>-	# Handle SIGINT (Ctrl-C); force abort of while() loop
>-	trap break SIGINT
>+	if [ -n "${netwait_ip}" ]; then
>+		# Handle SIGINT (Ctrl-C); force abort of for() loop
>+		trap break SIGINT
> 
>-	for ip in ${netwait_ip}; do
>-		echo -n "Waiting for ${ip} to respond to ICMP"
>+		for ip in ${netwait_ip}; do
>+			echo -n "Waiting for ${ip} to respond to ICMP"
> 
>-		count=1
>-		while [ ${count} -le ${netwait_timeout} ]; do
>-			/sbin/ping -t 1 -c 1 -o ${ip} >/dev/null 2>&1
>-			rc=$?
>+			count=1
>+			while [ ${count} -le ${netwait_timeout} ]; do
>+				/sbin/ping -t 1 -c 1 -o ${ip} >/dev/null 2>&1
>+				rc=$?
> 
>-			if [ $rc -eq 0 ]; then
>-				# Restore default SIGINT handler
>-				trap - SIGINT
>+				if [ $rc -eq 0 ]; then
>+					# Restore default SIGINT handler
>+					trap - SIGINT
> 
>-				echo '.'
>-				return
>-			fi
>-			count=$((count+1))
>+					echo '.'
>+					return
>+				fi
>+				count=$((count+1))
>+			done
>+			echo ': No response from host.'
> 		done
>-		echo ': No response from host.'
>-	done
> 
>-	# Restore default SIGINT handler
>-	trap - SIGINT
>+		# Restore default SIGINT handler
>+		trap - SIGINT
> 
>-	warn "Exhausted IP list.  Continuing with startup, but be aware you may"
>-	warn "not have a fully functional networking layer at this point."
>+		warn "Exhausted IP list.  Continuing with startup, but be aware you may"
>+		warn "not have a fully functional networking layer at this point."
>+	fi
> }
> 
> load_rc_config $name

Actions: View | Diff

Attachments on bug 205263: 164144 | 164145 | 164165