Attachment #190307 for bug #268598

View | Details | Raw Unified | Return to bug 268598
Collapse All | Expand All

Lines 60-65 Link Here

(-)baselayout-1.12.11.1/etc/conf.d/rc (+7 lines)
60		60
61	RC_NET_STRICT_CHECKING="no"	61	RC_NET_STRICT_CHECKING="no"
62		62
		63	# RC_UP_INTERFACE_TIMEOUT allows you to specify a timeout period in seconds
		64	# to wait before any network interface (besides net.lo) receives or gains an IP address.
		65	# This is useful for networks that use DHCP, wireless authentication methods,
		66	# or any other method that requires time to pass before the interface receives an IP.
		67
		68	RC_UP_INTERFACE_TIMEOUT="20"
		69
63	# RC_DOWN_INTERFACE allows you to specify if RC will bring the interface	70	# RC_DOWN_INTERFACE allows you to specify if RC will bring the interface
64	# completely down when it stops. The default is yes, but there are some	71	# completely down when it stops. The default is yes, but there are some
65	# instances where you may not want this to happen such as using Wake On LAN.	72	# instances where you may not want this to happen such as using Wake On LAN.

Lines 145-151 Link Here

(-)baselayout-1.12.11.1/lib/rcscripts/net/wpa_supplicant.sh (-1 / +1 lines)
145	timeout="associate_timeout_${ifvar}"	145	timeout="associate_timeout_${ifvar}"
146	timeout="${!timeout:--1}"	146	timeout="${!timeout:--1}"
147		147
148	[[ -z ${actfile} && ${timeout} -lt 0 ]] && timeout="60"	148	[[ -n ${actfile} && ${timeout} -lt 0 ]] && timeout="60"
149		149
150	if [[ ${timeout} == "0" ]] ; then	150	if [[ ${timeout} == "0" ]] ; then
151	ewarn "WARNING: infinite timeout set for association on ${iface}"	151	ewarn "WARNING: infinite timeout set for association on ${iface}"




			CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"
		done
	else
		CRITICAL_SERVICES="checkroot modules"
	fi

	export CRITICAL_SERVICES

# Start scripts
for i in $(get_start_services) ; do
	if service_stopped "${i}" ; then
		# If service is a 'net' service, wait for the interface to be setup
		if net_service "${i}" && [[ "${i}" != net.lo ]] ; then
			do_interactive start_service "${i}"
			ebegin "Configuring network interface"
		        sleep 1
		        if ! is_net_up ; then
		                einfon "  Waiting for network interface to come up ."
                		cnt=0
		                while ! is_net_up ; do
		                        cnt=$(expr $cnt + 1)
		                        if [ $cnt -gt ${RC_UP_INTERFACE_TIMEOUT} ] ; then
		                                echo
		                                eend 1 "Failed."
		                                break
		                        fi
		                        sleep 2
		                        echo -n "."
		                done
		                echo
		        fi
		        eend 0
		# Only start 'net' dependant services if network is up
		elif dependon "${i}" net ; then
			is_net_up && do_interactive start_service "${i}" || \
			eerror ""${i}" not started (no IP address present for any interfaces)!"
		else
			do_interactive start_service "${i}"
		fi
	fi
done


Lines 754-764 Link Here

(-)baselayout-1.12.11.1/sbin/rc-services.sh (-5 / +1 lines)
754	return 0	754	return 0
755	;;	755	;;
756	*)	756	*)
757	for x in $(dolisting "${svcdir}/started/net.*") ; do	757	[[ -n $(ifconfig -a \| grep "inet addr:" \| grep -v 127.0.0.1) ]] && return 0
758	local y="${x##*/}"
759	[[ ${y} == "$1" ]] && continue
760	[[ ${y} != "net.lo" ]] && return 0
761	done
762	return 1	758	return 1
763	;;	759	;;
764	esac	760	esac

Return to bug 268598

Lines 166-172 Link Here

(-)baselayout-1.12.11.1/sbin/rc (-2 / +29 lines)
166	CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"	166	CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"
167	done	167	done
168	else	168	else
169	CRITICAL_SERVICES="checkroot modules checkfs localmount clock bootmisc"	169	CRITICAL_SERVICES="checkroot modules"
170	fi	170	fi
171		171
172	export CRITICAL_SERVICES	172	export CRITICAL_SERVICES
Lines 861-867 Link Here
861	# Start scripts	861	# Start scripts
862	for i in $(get_start_services) ; do	862	for i in $(get_start_services) ; do
863	if service_stopped "${i}" ; then	863	if service_stopped "${i}" ; then
864	do_interactive start_service "${i}"	864	# If service is a 'net' service, wait for the interface to be setup
		865	if net_service "${i}" && [[ "${i}" != net.lo ]] ; then
		866	do_interactive start_service "${i}"
		867	ebegin "Configuring network interface"
		868	sleep 1
		869	if ! is_net_up ; then
		870	einfon " Waiting for network interface to come up ."
		871	cnt=0
		872	while ! is_net_up ; do
		873	cnt=$(expr $cnt + 1)
		874	if [ $cnt -gt ${RC_UP_INTERFACE_TIMEOUT} ] ; then
		875	echo
		876	eend 1 "Failed."
		877	break
		878	fi
		879	sleep 2
		880	echo -n "."
		881	done
		882	echo
		883	fi
		884	eend 0
		885	# Only start 'net' dependant services if network is up
		886	elif dependon "${i}" net ; then
		887	is_net_up && do_interactive start_service "${i}" \|\| \
		888	eerror ""${i}" not started (no IP address present for any interfaces)!"
		889	else
		890	do_interactive start_service "${i}"
		891	fi
865	fi	892	fi
866	done	893	done
867		894