summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-08-29 19:45:22 +0200
committerLennart Poettering <lennart@poettering.net>2011-08-29 19:45:47 +0200
commit8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611 (patch)
tree80e1af66578e93330035fb60218a092eab3922c1 /units
parent7daa9e6e29b546275566084512ea4e547bc79b91 (diff)
plymouth: don't enable ask-password agent of plymouth is disabled
Diffstat (limited to 'units')
-rw-r--r--units/systemd-ask-password-plymouth.path1
-rw-r--r--units/systemd-ask-password-plymouth.service.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 6a96520921..ba592c7ce6 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth Directory Watch
DefaultDependencies=no
Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
Before=basic.target shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
index a7cd451aed..2e071bdc86 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth
DefaultDependencies=no
Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth