pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=96

Browse Source
This commit is contained in:
Raymond Wooninck 2012-12-18 15:08:02 +00:00 committed by Git OBS Bridge
parent d7671e9638
commit fe059c2759
3 changed files with 2 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
plymouth-remove-pid-file.patch
View File

@ -1,69 +0,0 @@
From 512e3a78469af8b0cee02007db6144d1bbc63e01 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 10 Sep 2012 16:43:09 -0400
Subject: [PATCH 1/4] main: fix debug message
If plymouthd is already running, then a second invocation will
fail with the message:
could not log bootup
This message is misleading, so fix it.
---
src/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: plymouth-0.8.6.1/src/main.c
===================================================================
--- plymouth-0.8.6.1.orig/src/main.c
+++ plymouth-0.8.6.1/src/main.c
@@ -2478,6 +2478,17 @@ main (int argc,
*/
argv[0][0] = '@';
+ state.boot_server = start_boot_server (&state);
+
+ if (state.boot_server == NULL)
+ {
+ ply_trace ("plymouthd is already running");
+
+ if (daemon_handle != NULL)
+ ply_detach_daemon (daemon_handle, EX_UNAVAILABLE);
+ return EX_UNAVAILABLE;
+ }
+
state.boot_buffer = ply_buffer_new ();
if (attach_to_session)
@@ -2492,19 +2503,6 @@ main (int argc,
}
}
- state.boot_server = start_boot_server (&state);
-
- if (state.boot_server == NULL)
- {
- ply_trace ("could not log bootup: %m");
-
- detach_from_running_session (&state);
-
- if (daemon_handle != NULL)
- ply_detach_daemon (daemon_handle, EX_UNAVAILABLE);
- return EX_UNAVAILABLE;
- }
-
state.progress = ply_progress_new ();
ply_progress_load_cache (state.progress,
Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
===================================================================
--- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in
+++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
@@ -5,7 +5,6 @@ Wants=systemd-ask-password-plymouth.path
After=systemd-vconsole-setup.service systemd-udev-trigger.service
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
-ConditionPathExists=!@plymouthruntimedir@/pid
[Service]
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session

2
plymouth.changes
View File

@ -4,6 +4,8 @@ Tue Dec 18 15:05:47 UTC 2012 - tittiatcoke@gmail.com
- Make sure that the right version of the scripts is required by
the main package. This to prevent that an update of the scripts
is not installed (bnc#793400)
- Removed obsolete patch plymouth-remove-pid-file.patch. Issue
has been resolved upstream
-------------------------------------------------------------------
Wed Nov 14 09:12:13 UTC 2012 - seife+obs@b1-systems.com

3
plymouth.spec
View File

@ -47,8 +47,6 @@ Patch8: systemd-no-warning.patch
# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
Patch9: plymouth-dracut-path.patch
Patch10: 0001-Some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976)
Patch11: plymouth-remove-pid-file.patch
Patch12: plymoith-sd-notforking.patch
Patch13: ply-sdunitdir.patch
# PATCH-OPENSUSE -- systemd-tty-ask-password-agent is in /usr/bin now.
@ -326,7 +324,6 @@ plugin.
%patch8 -p1
%patch9 -p0
%patch10 -p1
#patch11 -p1
%patch12
%patch13
# haha, evil condition... :-)