[patch] Fixes the described issue

coldplug.patch (text/plain), 3.12 KB, created by Roy Marples (RETIRED) on 2006-05-14 12:22:28 UTC

Index: sbin/rc
===================================================================
--- sbin/rc	(revision 2025)
+++ sbin/rc	(working copy)
@@ -684,9 +684,17 @@
 		# As we're in the bootlevel, add any services that failed due
 		# to /dev/.rcsysinit existing to the list
 		if [[ -d /dev/.rcboot ]] ; then
+			COLDPLUG_SERVICES=
 			for x in $(dolisting /dev/.rcboot/) ; do
-				[[ -L ${x} ]] && myscripts="${myscripts} ${x##*/}"
+				[[ -L ${x} ]] && COLDPLUG_SERVICES="${COLDPLUG_SERVICES} ${x##*/}"
 			done
+			for x in ${COLDPLUG_SERVICES} ; do
+				if [[ ! -e /etc/runlevels/"${BOOTLEVEL}"/"${x}" \
+				&& ! -e /etc/runlevels/"${DEFAULTLEVEL}"/"${x}" ]] ; then
+					myscripts="${myscripts} ${x}"
+					mark_service_coldplugged "${x}"
+				fi
+			done
 			einfo "Device initiated services:${HILITE}${myscripts}${NORMAL}"
 			rm -rf /dev/.rcboot
 		fi
@@ -737,24 +745,16 @@
 	service_stopped "${service}" && return 0
 	
 	# Candidate for zapping ?
-	[[ ! -L ${svcdir}/softscripts.new/${service} ]] || \
-		return 0
+	[[ -L ${svcdir}/softscripts.new/${service} ]] \
+		&& return 0
 
-	# If this is a 'net' service, we do not want to stop it if it was
-	# not in the previous runlevel, and we are not shutting down,
-	# rebooting or going to single runlevel.  This is because the user
-	# (or hotplut) might have started it (net.ppp?) ...
-	if net_service "${service}" && \
-	   [[ ${SOFTLEVEL} != "reboot" && \
-	      ${SOFTLEVEL} != "shutdown" && \
-	      ${SOFTLEVEL} != "single" ]] ; then
-		if [[ -z ${OLDSOFTLEVEL} ]] || \
-		   ! in_runlevel "${service}" "${OLDSOFTLEVEL}"
-		then
-			# This service is not in the previous runlevel, so
-			# do not stop it ...
-			return 0
-		fi
+	if [[ ${SOFTLEVEL} != "reboot" \
+	      && ${SOFTLEVEL} != "shutdown" \
+	      && ${SOFTLEVEL} != "single" ]] ; then
+	      	service_coldplugged "${service}" && return 0
+		[[ -z ${OLDSOFTLEVEL} ]] \
+			|| ! in_runlevel "${service}" "${OLDSOFTLEVEL}" \
+			&& return 0
 	fi
 
 	# Should not work for 'use'
Index: sbin/rc-services.sh
===================================================================
--- sbin/rc-services.sh	(revision 2025)
+++ sbin/rc-services.sh	(working copy)
@@ -478,6 +478,17 @@
 	fi
 }
 
+# bool mark_service_coldplugged(service)
+#
+#   Mark 'service' as coldplugged.
+#
+mark_service_coldplugged() {
+	[[ -z $1 ]] && return 1
+
+	ln -snf "/etc/init.d/$1" "${svcdir}/coldplugged/$1"
+	return 0
+}
+
 # bool mark_service_starting(service)
 #
 #   Mark 'service' as starting.
@@ -550,7 +561,8 @@
 	rm -Rf "${svcdir}/daemons/$1" "${svcdir}/starting/$1" \
 		"${svcdir}/started/$1" "${svcdir}/inactive/$1" \
 		"${svcdir}/wasinactive/$1" "${svcdir}/stopping/$1" \
-		"${svcdir}/scheduled/$1" "${svcdir}/options/$1"
+		"${svcdir}/scheduled/$1" "${svcdir}/options/$1" \
+		"${svcdir}/coldplugged/$1"
 
 	return 0
 }
@@ -571,6 +583,14 @@
 	return 1
 }
 
+# bool service_coldplugged(service)
+#
+#   Returns true if 'service' is coldplugged
+#
+service_coldplugged() {
+	test_service_state "$1" "coldplugged"
+}
+
 # bool service_starting(service)
 #
 #   Returns true if 'service' is starting
@@ -730,7 +750,6 @@
 		   ${x} == "net" ]] \
 				&& echo "${x}"
 	done
-
 	return 0
 }