plymouth: ensure we start not a single getty before plymouth is gone because we never...

diff --git a/TODO b/TODO
index 48c003a5b7473caad6da644acb2d321367f823c7..3fa765d91280d4f39679fa72f1171ab5c0f6c7d7 100644 (file)
--- 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 74ec1f30d59711da3dacc2ae87846c7bd7760d78..23ea9794b5a5f649dd29c6e935a76fab68a01557 100644 (file)
--- 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 6310eff495decfb65a3ab96acf26fb14b6bd76ad..dabe7c2d4914c4a19d213d5acc459115fed871ee 100644 (file)
--- 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 c7a11b1fa0c987e4d81df2e81a4013e6a6448da0..4b031d7fba72531b4b18f0138f8a12eb917ae141 100644 (file)
--- 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