summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-21 23:55:17 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-21 23:55:17 +0100
commitb7ff1e47da4653d2ff1ec7b489e6067fed29d8c5 (patch)
treede418497853af42da6de939e22c501253fdd876f
parent67d6a9abac34c2c15857c6ad459a5d381e2a7454 (diff)
plymouth: ensure we start not a single getty before plymouth is gone because we never know which ttys plymouth still controls
-rw-r--r--TODO4
-rw-r--r--units/getty@.service.m42
-rw-r--r--units/plymouth-quit.service3
-rw-r--r--units/serial-getty@.service.m42
4 files changed, 7 insertions, 4 deletions
diff --git a/TODO b/TODO
index 48c003a5b7..3fa765d912 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+F15:
+
+* dep cycle basic → udev-retry → auditd → iptables → basic
+
Bugs:
* isolate multi-user.target doesn't start a getty@tty1 if we run it from graphical.target
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 74ec1f30d5..23ea9794b5 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,7 +8,7 @@
[Unit]
Description=Getty on %I
BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit.service
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
)m4_dnl
diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service
index 6310eff495..dabe7c2d49 100644
--- a/units/plymouth-quit.service
+++ b/units/plymouth-quit.service
@@ -7,8 +7,7 @@
[Unit]
Description=Terminate Plymouth Boot Screen
-Before=getty@tty1.service
-After=dev-tty1.device rc-local.service plymouth-start.service
+After=rc-local.service plymouth-start.service
[Service]
ExecStart=-/bin/plymouth quit
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index c7a11b1fa0..4b031d7fba 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -8,7 +8,7 @@
[Unit]
Description=Serial Getty on %I
BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit.service
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
)m4_dnl