[patch] Lock init scripts from running when /dev/.rcsysinit exists

baselayout-sysinit.patch (text/plain), 1.12 KB, created by Roy Marples (RETIRED) on 2006-01-19 11:38:49 UTC

--- sbin/rc	2006-01-18 10:27:24.982073708 +0000
+++ /sbin/rc	2006-01-19 19:22:37.567119750 +0000
@@ -166,7 +164,7 @@
 			CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"
 		done
 	else
-		CRITICAL_SERVICES="checkroot hostname modules checkfs localmount clock"
+		CRITICAL_SERVICES="checkroot hostname modules checkfs localmount clock bootmisc"
 	fi
 
 	export CRITICAL_SERVICES
@@ -551,6 +549,9 @@
 	user_want_interactive && svcinteractive="yes"
 	echo "${svcinteractive:-no}" > "${svcdir}/interactive"
 
+	# sysinit is now done, so allow init scripts to run normally
+	[[ -e /dev/.rcsysinit ]] && rm -f /dev/.rcsysinit
+
 	# All done logging
 	bootlog quit
 
--- sbin/runscript.sh	2006-01-19 12:20:14.386834155 +0000
+++ /sbin/runscript.sh	2006-01-19 18:44:29.320982500 +0000
@@ -26,6 +22,12 @@
 export SVCNAME="${myservice}"
 mylevel="$(< "${svcdir}/softlevel")"
 
+# Stop init scripts from working until sysinit completes
+if [[ -e /dev/.rcsysinit ]] ; then
+	eerror "ERROR:  cannot run ${myservice} until sysinit completes"
+	exit 1
+fi
+
 svc_trap() {
 	trap 'eerror "ERROR:  \"${myservice}\" caught an interrupt"; exit 1' \
 		INT QUIT TSTP