Gentoo Archives: gentoo-commits

From: "Michael Januszewski (spock)" <spock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils/files: splashutils-1.5.4.3-openrc-umount-fix.patch
Date: Mon, 06 Apr 2009 19:18:45
Message-Id: E1LquLD-0003mo-3a@stork.gentoo.org
1 spock 09/04/06 19:18:43
2
3 Added: splashutils-1.5.4.3-openrc-umount-fix.patch
4 Log:
5 Fix the problem of the progress bar not reaching 100% during reboot.
6 (Portage version: 2.1.6.11/cvs/Linux x86_64, RepoMan options: --force)
7
8 Revision Changes Path
9 1.1 media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch?rev=1.1&content-type=text/plain
13
14 Index: splashutils-1.5.4.3-openrc-umount-fix.patch
15 ===================================================================
16 commit ae4b5cc9c2d904e18db51876d9bd292504714600
17 Author: MichaƂ Januszewski <spock@g.o>
18 Date: Mon Apr 6 20:59:48 2009 +0200
19
20 Prevent umounting of theme directories.
21
22 Some themes dynamically modify themselves during boot. In order to be
23 able to do that, they mount a tmpfs in their main directory. Prevent
24 openrc from umounting this directory when rebooting.
25
26 diff --git a/gentoo/splash.c b/gentoo/splash.c
27 index 048e0ec..d831d0c 100644
28 --- a/gentoo/splash.c
29 +++ b/gentoo/splash.c
30 @@ -968,10 +968,10 @@ do_start:
31 if (name && !strcmp(name, "localmount")) {
32 char *umounts = getenv("RC_NO_UMOUNTS");
33
34 - if (umounts)
35 - fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:%s", umounts, FBSPLASH_CACHEDIR);
36 - else
37 - fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s", FBSPLASH_CACHEDIR);
38 + if (umounts)
39 + fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:" FBSPLASH_CACHEDIR ":/etc/splash/%s", umounts, config->theme);
40 + else
41 + fprintf(rc_environ_fd, "RC_NO_UMOUNTS=" FBSPLASH_CACHEDIR ":/etc/splash/%s", config->theme);
42 }
43 i = splash_svc_handle(name, "svc_stop", false);
44 break;