summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-08-29 21:48:51 +0200
committerLennart Poettering <lennart@poettering.net>2011-08-29 21:48:51 +0200
commit6b3fd98f7a8eb4adbc134797fb2e81a643004e0d (patch)
treed3fb876ff6800bedda2805633d773889058674c4 /units
parent8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611 (diff)
untis: allow both console and plymouth ask password agents in boot transaction to allow dynamically disabled plymouth
Diffstat (limited to 'units')
-rw-r--r--units/systemd-ask-password-console.path2
-rw-r--r--units/systemd-ask-password-console.service.in2
-rw-r--r--units/systemd-ask-password-plymouth.path4
-rw-r--r--units/systemd-ask-password-plymouth.service.in4
4 files changed, 10 insertions, 2 deletions
diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index b5acf943b4..c3143d1da6 100644
--- a/units/systemd-ask-password-console.path
+++ b/units/systemd-ask-password-console.path
@@ -9,7 +9,9 @@
Description=Dispatch Password Requests to Console Directory Watch
DefaultDependencies=no
Conflicts=shutdown.target
+After=plymouth-start.service
Before=basic.target shutdown.target
+ConditionPathExists=!/run/plymouth/pid
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service.in
index a2ac09cd6a..5ff3ed55d7 100644
--- a/units/systemd-ask-password-console.service.in
+++ b/units/systemd-ask-password-console.service.in
@@ -9,7 +9,9 @@
Description=Dispatch Password Requests to Console
DefaultDependencies=no
Conflicts=shutdown.target
+After=plymouth-start.service
Before=shutdown.target
+ConditionPathExists=!/run/plymouth/pid
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console
diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index ba592c7ce6..06a587620f 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -8,9 +8,11 @@
[Unit]
Description=Forward Password Requests to Plymouth Directory Watch
DefaultDependencies=no
-Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
+Conflicts=shutdown.target
+After=plymouth-start.service
Before=basic.target shutdown.target
ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
[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 2e071bdc86..92cbfdbf09 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -8,9 +8,11 @@
[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
ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth