Merge branch 'master' into journal

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

diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index 6ab51f32af25e8a7545f4548176e23fcf11a9749..f618257a937babb57bce4fa4f9d9e050aca38e79 100644 (file)
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -13,9 +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=!/run/initramfs/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