chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'journal'
[elogind.git]
/
units
/
systemd-ask-password-plymouth.service.in
diff --git
a/units/systemd-ask-password-plymouth.service.in
b/units/systemd-ask-password-plymouth.service.in
index a7cd451aed5815088896d0c4f49c7ee09075ea40..92cbfdbf09ada045aec435adc393c280ac9be574 100644
(file)
--- a/
units/systemd-ask-password-plymouth.service.in
+++ b/
units/systemd-ask-password-plymouth.service.in
@@
-8,8
+8,11
@@
[Unit]
Description=Forward Password Requests to Plymouth
DefaultDependencies=no
[Unit]
Description=Forward Password Requests to Plymouth
DefaultDependencies=no
-Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
+Conflicts=shutdown.target
+After=plymouth-start.service
Before=shutdown.target
Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth