From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 10 Sep 2012 20:32:45 +0000 (-0400)
Subject: service: start plymouthd unconditionally
X-Git-Tag: 0.8.8~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=714a08b0c0bcee005dbcc898bb952387657e39e9;p=thirdparty%2Fplymouth.git

service: start plymouthd unconditionally

It's possible to get in a state where plymouthd is
started in the initrd but not displayed.  In the
event this happens, we'll neglect to ever show it,
since it already has a pid file.

plymouthd is now hardened against getting called
multiple times, so we no longer need to protect it
at the systemd level.

This commit drops the

ConditionPathExists=!@plymouthruntimedir@/pid

line from the systemd service file, so we always
call plymouthd from the main fs and always call
plymouth show-splash.
---

diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
index aec26177..bbff9f58 100644
--- a/systemd-units/plymouth-start.service.in
+++ b/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