[systemd-commits] 4 commits - units/getty at .service.m4 units/serial-getty at .service.m4 units/systemd-ask-password-plymouth.path units/systemd-ask-password-plymouth.service.in units/systemd-ask-password-wall.path

[Lennart Poettering]

 units/getty at .service.m4                        |    3 ++-
 units/serial-getty at .service.m4                 |    3 ++-
 units/systemd-ask-password-plymouth.path       |    4 +++-
 units/systemd-ask-password-plymouth.service.in |    3 +++
 units/systemd-ask-password-wall.path           |    4 +++-
 5 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 180f90cb13ffbf8e6269ec3afb24243fec936e0c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 01:54:07 2010 +0100

    units: set TERM for gettys again, since they acquire a TTY on their own

diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
index 8ac3925..902ab6e 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .service.m4
@@ -22,6 +22,7 @@ After=rc-local.service
 Before=getty.target
 
 [Service]
+Environment=TERM=linux
 ExecStart=-/sbin/agetty %I 38400
 Restart=always
 RestartSec=0
diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
index d08203e..b6ca80b 100644
--- a/units/serial-getty at .service.m4
+++ b/units/serial-getty at .service.m4
@@ -22,6 +22,7 @@ After=rc-local.service
 Before=getty.target
 
 [Service]
+Environment=TERM=vt100-nav
 m4_ifdef(`TARGET_FEDORA',
 ExecStartPre=-/sbin/securetty %I
 )m4_dnl

commit f2a29e51f21f446c8b6e53f60c72bedf5b8b4e25
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 01:51:57 2010 +0100

    units: allow start-up of plymouth ask-password agent very early

diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 827f138..8e5e512 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -8,6 +8,8 @@
 [Unit]
 Description=Forward Password Requests to Plymouth Directory Watch
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password
diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
index 3cd9b7f..8ed22ac 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -7,6 +7,9 @@
 
 [Unit]
 Description=Forward Password Requests to Plymouth
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
 ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index d7a9e3c..9c4b1d3 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -8,6 +8,8 @@
 [Unit]
 Description=Forward Password Requests to Wall Directory Watch
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password

commit 74c84e715a44e25a962337110ac369c4f0ec0dbf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 01:25:48 2010 +0100

    units: enable ask-paswword .path units early enough to be useful for early mounts

diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 9fd51f2..827f138 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Forward Password Requests to Plymouth Directory Watch
-After=local-fs.target
+DefaultDependencies=no
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index a555d26..d7a9e3c 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Forward Password Requests to Wall Directory Watch
-After=local-fs.target
+DefaultDependencies=no
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password

commit 1e7ba843daad637eb118b9098452d53ca13ca70b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 16 01:25:19 2010 +0100

    units: delay getty until logins are allowed

diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
index d6bd9a9..8ac3925 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .service.m4
@@ -8,7 +8,7 @@
 [Unit]
 Description=Getty on %I
 BindTo=dev-%i.device
-After=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
index d454dce..d08203e 100644
--- a/units/serial-getty at .service.m4
+++ b/units/serial-getty at .service.m4
@@ -8,7 +8,7 @@
 [Unit]
 Description=Serial Getty on %I
 BindTo=dev-%i.device
-After=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl