chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8e4fb44
)
untis: allow both console and plymouth ask password agents in boot transaction to...
author
Lennart Poettering
<lennart@poettering.net>
Mon, 29 Aug 2011 19:48:51 +0000
(21:48 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 29 Aug 2011 19:48:51 +0000
(21:48 +0200)
units/systemd-ask-password-console.path
patch
|
blob
|
history
units/systemd-ask-password-console.service.in
patch
|
blob
|
history
units/systemd-ask-password-plymouth.path
patch
|
blob
|
history
units/systemd-ask-password-plymouth.service.in
patch
|
blob
|
history
diff --git
a/units/systemd-ask-password-console.path
b/units/systemd-ask-password-console.path
index b5acf943b4c918ce552dd703b6e59ef8cf9fffd9..c3143d1da6010a272e2abb648efebb085a329118 100644
(file)
--- 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
Description=Dispatch Password Requests to Console Directory Watch
DefaultDependencies=no
Conflicts=shutdown.target
+After=plymouth-start.service
Before=basic.target shutdown.target
Before=basic.target shutdown.target
+ConditionPathExists=!/run/plymouth/pid
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
[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 a2ac09cd6a3dfcaa3f11737d01b8d0d383cc644c..5ff3ed55d7a3ec426340b8767bcb1eb94f96a91a 100644
(file)
--- 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
Description=Dispatch Password Requests to Console
DefaultDependencies=no
Conflicts=shutdown.target
+After=plymouth-start.service
Before=shutdown.target
Before=shutdown.target
+ConditionPathExists=!/run/plymouth/pid
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console
[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 ba592c7ce6ca7289090d482e978d79598e0fa453..06a587620f6ab757eac1aeea1ab17f0c19438a74 100644
(file)
--- 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
[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
Before=basic.target shutdown.target
ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
[Path]
DirectoryNotEmpty=/run/systemd/ask-password
[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 2e071bdc86136c5db5d65b3e8a68ed85d2ce8442..92cbfdbf09ada045aec435adc393c280ac9be574 100644
(file)
--- 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
[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
Before=shutdown.target
ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
[Service]
ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth