plymouth: introduce plymouth.enable=0 kernel command line switch

[elogind.git] / units / plymouth-start.service

diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index c3c101eb8ad8e77d8ea0cb4aff42084ca85b88e3..f618257a937babb57bce4fa4f9d9e050aca38e79 100644 (file)
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -13,12 +13,10 @@ After=systemd-vconsole-setup.service udev-settle.service
 Before=systemd-ask-password-plymouth.service
 
 # Dracut informs us with this flag file if plymouth is already running
-ConditionPathExists=!/dev/.systemd/plymouth
+ConditionPathExists=!/run/plymouth/pid
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=/sbin/plymouthd --mode=boot
+ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
 ExecStartPost=-/bin/plymouth --show-splash
 Type=forking
-
-# Send SIGRTMIN+20 to systemd, i.e. enable status messages
-ExecStartPost=-/usr/bin/kill -54 1