[patch] Temporary patch

splashutils-openrc.patch (text/plain), 2.00 KB, created by Peter Levine on 2009-01-02 08:09:16 UTC

--- ./splash.c.old	2008-12-25 04:58:00.999036766 -0500
+++ ./splash.c	2008-12-25 05:10:48.949006175 -0500
@@ -593,7 +593,7 @@
 
 	/* Get a list of services that we'll have to handle. */
 	/* We're rebooting/shutting down. */
-	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN) || !strcmp(runlevel, RC_LEVEL_REBOOT)) {
+	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN)) {
 		if ((err = fbsplash_cache_prep()))
 			return err;
 		splash_svcs_stop(runlevel);
@@ -690,9 +690,7 @@
 	int retval = 0;
 
 	runlev = rc_runlevel_get();
-	if (!strcmp(runlev, RC_LEVEL_REBOOT))
-		type = fbspl_reboot;
-	else if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
+	if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
 		type = fbspl_shutdown;
 
 	/* Get boot and default levels from env variables exported by RC.
@@ -716,7 +714,7 @@
 			list = rc_stringlist_new();
 			get_list_fp(list, fp);
 			TAILQ_FOREACH(s, list, entries)
-				rc_service_mark(s->value, RC_SERVICE_COLDPLUGGED);
+				rc_service_mark(s->value, RC_SERVICE_HOTPLUGGED);
 			pclose(fp);
 			rc_stringlist_free(list);
 		}
@@ -739,7 +737,7 @@
 			goto exit;
 
 		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&
-			strcmp(runlev, RC_LEVEL_REBOOT) && strcmp(runlev, RC_LEVEL_SHUTDOWN))
+			strcmp(runlev, RC_LEVEL_SHUTDOWN))
 			goto exit;
 	}
 
@@ -763,7 +761,7 @@
 	case RC_HOOK_RUNLEVEL_STOP_IN:
 		/* Start the splash daemon on reboot. The theme hook is called
 		 * from splash_start(). */
-		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+		if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
 			if ((i = splash_start(name))) {
 				fbsplash_set_verbose(0);
 				retval= i;
@@ -788,7 +786,7 @@
 	case RC_HOOK_RUNLEVEL_STOP_OUT:
 		/* Make sure the progress indicator reaches 100%, even if
 		 * something went wrong along the way. */
-		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+		if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
 			config->verbosity = FBSPL_VERB_QUIET;
 			i = fbsplash_check_daemon(&pid_daemon);
 			config->verbosity = FBSPL_VERB_NORMAL;