untis: allow both console and plymouth ask password agents in boot transaction to allow dynamically disabled plymouth

This commit is contained in:
Lennart Poettering 2011-08-29 21:48:51 +02:00
parent 8e4fb44ab0
commit 6b3fd98f7a
4 changed files with 10 additions and 2 deletions

View file

@ -9,7 +9,9 @@
Description=Dispatch Password Requests to Console Directory Watch Description=Dispatch Password Requests to Console Directory Watch
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
After=plymouth-start.service
Before=basic.target shutdown.target Before=basic.target shutdown.target
ConditionPathExists=!/run/plymouth/pid
[Path] [Path]
DirectoryNotEmpty=/run/systemd/ask-password DirectoryNotEmpty=/run/systemd/ask-password

View file

@ -9,7 +9,9 @@
Description=Dispatch Password Requests to Console Description=Dispatch Password Requests to Console
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
After=plymouth-start.service
Before=shutdown.target Before=shutdown.target
ConditionPathExists=!/run/plymouth/pid
[Service] [Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console

View file

@ -8,9 +8,11 @@
[Unit] [Unit]
Description=Forward Password Requests to Plymouth Directory Watch Description=Forward Password Requests to Plymouth Directory Watch
DefaultDependencies=no 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 Before=basic.target shutdown.target
ConditionKernelCommandLine=!plymouth.enable=0 ConditionKernelCommandLine=!plymouth.enable=0
ConditionPathExists=/run/plymouth/pid
[Path] [Path]
DirectoryNotEmpty=/run/systemd/ask-password DirectoryNotEmpty=/run/systemd/ask-password

View file

@ -8,9 +8,11 @@
[Unit] [Unit]
Description=Forward Password Requests to Plymouth Description=Forward Password Requests to Plymouth
DefaultDependencies=no 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 Before=shutdown.target
ConditionKernelCommandLine=!plymouth.enable=0 ConditionKernelCommandLine=!plymouth.enable=0
ConditionPathExists=/run/plymouth/pid
[Service] [Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth