Clean up bootstrap-only tasks when leaving bootstrap 'S' runlevel

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

service.c

@@ -598,7 +598,8 @@ void service_runlevel(int newlevel)
 	else
 		erase("/etc/nologin");
 
-	if (0 != prevlevel)
+	/* No TTYs run at bootstrap, they have a delayed start. */
+	if (prevlevel > 0)
 		tty_runlevel(runlevel);
 }
 
@@ -869,6 +870,9 @@ void service_monitor(pid_t lost)
 		if (lost != svc->pid)
 			continue;
 
+		if (!prevlevel && svc_clean_bootstrap(svc))
+			continue;
+
 		if (SVC_TYPE_SERVICE != svc->type) {
 			svc->pid = 0;
 			continue;