From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Aug 2011 17:45:22 +0000 (+0200)
Subject: plymouth: don't enable ask-password agent of plymouth is disabled
X-Git-Tag: v35~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611

plymouth: don't enable ask-password agent of plymouth is disabled
---

diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 6a9652092..ba592c7ce 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 a7cd451ae..2e071bdc8 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