summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2009-11-22 20:12:23 +0000
committerMichael Januszewski <spock@gentoo.org>2009-11-22 20:12:23 +0000
commit2d95a562e21b5016b2082823087d7c904eb692b9 (patch)
treee0f56a4502241b16319de256970daec704b4cadd /media-gfx/splashutils/files
parentCopy 1.6.6 to 1.6.6-r10 without changes. Disable KDE support in 1.6.6 to allo... (diff)
downloadgentoo-2-2d95a562e21b5016b2082823087d7c904eb692b9.tar.gz
gentoo-2-2d95a562e21b5016b2082823087d7c904eb692b9.tar.bz2
gentoo-2-2d95a562e21b5016b2082823087d7c904eb692b9.zip
Fix bug #282995.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/splashutils/files')
-rw-r--r--media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch
new file mode 100644
index 000000000000..f395eca3a6d2
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch
@@ -0,0 +1,24 @@
+commit 6f9aa3a3bc11e539613facf3caba5dcdb43c0117
+Author: Michał Januszewski <spock@gentoo.org>
+Date: Sun Nov 22 20:56:47 2009 +0100
+
+ gentoo: make sure the splash daemon works when boot goes through a named runlevel other than default
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index d831d0c..4b9a5b9 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -777,10 +777,12 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ hook != RC_HOOK_RUNLEVEL_START_OUT)
+ goto exit;
+ } else {
++ int pid;
++
+ /* We're starting/stopping a runlevel. Check whether we're
+ * actually booting/rebooting. */
+ if (rc_runlevel_starting() && strcmp(runlev, bootlevel) &&
+- strcmp(runlev, defaultlevel) && strcmp(runlev, RC_LEVEL_SYSINIT))
++ strcmp(runlev, RC_LEVEL_SYSINIT) && fbsplash_check_daemon(&pid))
+ goto exit;
+
+ if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&