X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fplymouth-start.service;h=1f05d5cd7bf454ab6209ad488e97022f0507cd9e;hp=6ab51f32af25e8a7545f4548176e23fcf11a9749;hb=5cd6eef69b926175b889799d80bd9deb33a904d1;hpb=39366bacda3dddbae3c6677da5c97770cff0a279

diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index 6ab51f32a..1f05d5cd7 100644
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -1,8 +1,8 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
@@ -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