Commit aa2e2115 authored by Lennart Poettering's avatar Lennart Poettering

units: synchronize gettys to plymouth even if plymouth is killed by gdm

parent 2e0d98fa
...@@ -243,7 +243,6 @@ dist_systemunit_DATA = \ ...@@ -243,7 +243,6 @@ dist_systemunit_DATA = \
units/systemd-tmpfiles-clean.timer \ units/systemd-tmpfiles-clean.timer \
units/quotaon.service \ units/quotaon.service \
units/systemd-ask-password-wall.path \ units/systemd-ask-password-wall.path \
units/systemd-ask-password-plymouth.path \
units/systemd-ask-password-console.path units/systemd-ask-password-console.path
nodist_systemunit_DATA = \ nodist_systemunit_DATA = \
...@@ -270,7 +269,6 @@ nodist_systemunit_DATA = \ ...@@ -270,7 +269,6 @@ nodist_systemunit_DATA = \
units/systemd-tmpfiles-clean.service \ units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \ units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \ units/systemd-ask-password-wall.service \
units/systemd-ask-password-plymouth.service \
units/systemd-ask-password-console.service \ units/systemd-ask-password-console.service \
units/systemd-sysctl.service \ units/systemd-sysctl.service \
units/syslog.target \ units/syslog.target \
...@@ -316,7 +314,6 @@ EXTRA_DIST = \ ...@@ -316,7 +314,6 @@ EXTRA_DIST = \
units/systemd-tmpfiles-clean.service.in \ units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \ units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-plymouth.service.in \
units/systemd-ask-password-console.service.in \ units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \ units/systemd-sysctl.service.in \
units/syslog.target.in \ units/syslog.target.in \
...@@ -343,10 +340,18 @@ dist_systemunit_DATA += \ ...@@ -343,10 +340,18 @@ dist_systemunit_DATA += \
units/plymouth-start.service \ units/plymouth-start.service \
units/plymouth-read-write.service \ units/plymouth-read-write.service \
units/plymouth-quit.service \ units/plymouth-quit.service \
units/plymouth-quit-wait.service \
units/plymouth-reboot.service \ units/plymouth-reboot.service \
units/plymouth-kexec.service \ units/plymouth-kexec.service \
units/plymouth-poweroff.service \ units/plymouth-poweroff.service \
units/plymouth-halt.service units/plymouth-halt.service \
units/systemd-ask-password-plymouth.path
nodist_systemunit_DATA += \
units/systemd-ask-password-plymouth.service
EXTRA_DIST += \
units/systemd-ask-password-plymouth.service.in
endif endif
dist_doc_DATA = \ dist_doc_DATA = \
...@@ -1302,8 +1307,9 @@ if HAVE_PLYMOUTH ...@@ -1302,8 +1307,9 @@ if HAVE_PLYMOUTH
$(LN_S) ../plymouth-start.service plymouth-start.service && \ $(LN_S) ../plymouth-start.service plymouth-start.service && \
$(LN_S) ../plymouth-read-write.service plymouth-read-write.service ) $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f plymouth-quit.service && \ rm -f plymouth-quit.service plymouth-quit-wait.service && \
$(LN_S) ../plymouth-quit.service plymouth-quit.service ) $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
$(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \ ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \ rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service ) $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
......
...@@ -17,6 +17,8 @@ F15: ...@@ -17,6 +17,8 @@ F15:
* NFS, networkmanager ordering issue * NFS, networkmanager ordering issue
* Make systemd-cryptsetup cancellable
Features: Features:
* introduce simple way to do mandatory conditions * introduce simple way to do mandatory conditions
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
[Unit] [Unit]
Description=Getty on %I Description=Getty on %I
BindTo=dev-%i.device BindTo=dev-%i.device
After=dev-%i.device systemd-user-sessions.service plymouth-quit.service After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
m4_ifdef(`TARGET_FEDORA', m4_ifdef(`TARGET_FEDORA',
After=rc-local.service After=rc-local.service
)m4_dnl )m4_dnl
......
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Wait for Plymouth Boot Screen to Quit
After=rc-local.service plymouth-start.service
[Service]
ExecStart=-/bin/plymouth --wait
Type=oneshot
TimeoutSec=20
...@@ -8,13 +8,16 @@ ...@@ -8,13 +8,16 @@
[Unit] [Unit]
Description=Serial Getty on %I Description=Serial Getty on %I
BindTo=dev-%i.device BindTo=dev-%i.device
After=dev-%i.device systemd-user-sessions.service plymouth-quit.service After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
m4_ifdef(`TARGET_FEDORA', m4_ifdef(`TARGET_FEDORA',
After=rc-local.service After=rc-local.service
)m4_dnl )m4_dnl
m4_ifdef(`TARGET_ARCH', m4_ifdef(`TARGET_ARCH',
After=rc-local.service After=rc-local.service
)m4_dnl )m4_dnl
m4_ifdef(`TARGET_FRUGALWARE',
After=local.service
)m4_dnl
# If additional gettys are spawned during boot then we should make # If additional gettys are spawned during boot then we should make
# sure that this is synchronized before getty.target, even though # sure that this is synchronized before getty.target, even though
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment