From 6b3fd98f7a8eb4adbc134797fb2e81a643004e0d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Aug 2011 21:48:51 +0200
Subject: [PATCH] untis: allow both console and plymouth ask password agents in
 boot transaction to allow dynamically disabled plymouth

---
 units/systemd-ask-password-console.path        | 2 ++
 units/systemd-ask-password-console.service.in  | 2 ++
 units/systemd-ask-password-plymouth.path       | 4 +++-
 units/systemd-ask-password-plymouth.service.in | 4 +++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index b5acf943b..c3143d1da 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 a2ac09cd6..5ff3ed55d 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 ba592c7ce..06a587620 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 2e071bdc8..92cbfdbf0 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
-- 
2.30.2