diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2009-11-22 20:12:23 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2009-11-22 20:12:23 +0000 |
| commit | 2d95a562e21b5016b2082823087d7c904eb692b9 (patch) | |
| tree | e0f56a4502241b16319de256970daec704b4cadd /media-gfx/splashutils | |
| parent | Copy 1.6.6 to 1.6.6-r10 without changes. Disable KDE support in 1.6.6 to allo... (diff) | |
| download | gentoo-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')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch | 24 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.3.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 1e9b429c1484..897d7d9641d0 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.163 2009/09/12 12:28:27 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.164 2009/11/22 20:12:23 spock Exp $ + + 22 Nov 2009; Michał Januszewski <spock@gentoo.org> + splashutils-1.5.4.3.ebuild, + +files/splashutils-1.5.4.3-nondefault-runlevel.patch: + Fix bug #282995. 12 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> splashutils-1.5.4.3.ebuild: 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) && diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild index 748d367805a6..c92df3002839 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.15 2009/09/12 12:28:27 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.16 2009/11/22 20:12:23 spock Exp $ EAPI="2" @@ -95,6 +95,7 @@ src_prepare() { fi epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch + epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch cd "${S}" rm -f m4/* |