units: don't try to load kernel modules if CAP_SYS_MODULE is missing

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

diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index c3c101eb8ad8e77d8ea0cb4aff42084ca85b88e3..1f05d5cd7bf454ab6209ad488e97022f0507cd9e 100644 (file)
--- 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,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