[patch] Sleep init scripts until sysinit has completed

hotplug.patch (text/plain), 1.99 KB, created by Roy Marples (RETIRED) on 2006-01-17 08:17:53 UTC

--- sbin/rc	2006-01-13 10:25:41.000000000 +0000
+++ /tmp/rc	2006-01-17 16:05:24.480903569 +0000
@@ -414,6 +414,16 @@
 
 	splash "rc_init" "${argv1}"
 
+	# We need to disable hotplug until CRITICAL_SERVICES has completed.
+	# This is because modules can trigger net.agent which launches runscript.sh
+	# which pulls in critical services again, which is bad. However, we may
+	# need modules for some CRITICAL_SERVICES. See bug #118419.
+	save_hotplug=
+	if [[ -e /proc/sys/kernel/hotplug ]] ; then
+		save_hotplug=$( < /proc/sys/kernel/hotplug )
+		echo "/bin/false" > /proc/sys/kernel/hotplug
+	fi
+
 	export START_CRITICAL="yes"
 	
 	# We do not want to break compatibility, so we do not fully integrate
@@ -518,6 +528,11 @@
 		done
 	)
 
+	# Restore hotplug, allowing queued scripts to continue
+	if [[ -n ${save_hotplug} ]] ; then
+		echo "${save_hotplug}" > /proc/sys/kernel/hotplug
+	fi
+
 	# If the user's /dev/null or /dev/console are missing, we 
 	# should help them out and explain how to rectify the situation
 	if [ ${dev_null} -eq 0 -o ${dev_console} -eq 0 ] \
--- sbin/runscript.sh	2006-01-13 11:55:42.000000000 +0000
+++ /tmp/runscript.sh	2006-01-17 16:08:18.106430482 +0000
@@ -24,7 +24,6 @@
 
 myservice="${myservice##*/}"
 export SVCNAME="${myservice}"
-mylevel="$(< "${svcdir}/softlevel")"
 
 svc_trap() {
 	trap 'eerror "ERROR:  \"${myservice}\" caught an interrupt"; exit 1' \
@@ -34,6 +33,28 @@
 # Setup a default trap
 svc_trap
 
+# Loop until hotplugging is enabled
+if [[ -e /proc/sys/kernel/hotplug ]] ; then
+	warned=1
+	while true ; do
+		case "$(</proc/sys/kernel/hotplug)" in
+			/dev/null|/bin/false|/bin/true)
+				if [[ ${warned} == 1 ]] ; then
+					ewarn "Sleeping until hotplugging is enabled ..."
+					warned=0
+				fi
+				sleep 0.1
+				;;
+			*)
+				break
+				;;
+		esac
+		unset warned
+	done
+fi
+
+mylevel="$(< "${svcdir}/softlevel")"
+
 # Functions to handle dependencies and services
 [[ ${RC_GOT_SERVICES} != "yes" ]] && source "${svclib}/sh/rc-services.sh"
 # Functions to control daemons