From 8e4fb44ab0f853ff8faedcaa2cbc58b80eda9611 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Aug 2011 19:45:22 +0200 Subject: plymouth: don't enable ask-password agent of plymouth is disabled --- units/systemd-ask-password-plymouth.path | 1 + units/systemd-ask-password-plymouth.service.in | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.3-54-g00ecf