diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-02-24 02:32:50 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-02-24 02:32:50 +0100 |
| commit | aa2e2115873e102b8f6701f4211ddf7bec4c5e10 (patch) | |
| tree | 5e29ba4ff980bf3a9bebe7e958512f256bea5d91 /units | |
| parent | 2e0d98fa87a4e399763c8235abe56be4f8ac7fb8 (diff) | |
units: synchronize gettys to plymouth even if plymouth is killed by gdm
Diffstat (limited to 'units')
| -rw-r--r-- | units/getty@.service.m4 | 2 | ||||
| -rw-r--r-- | units/plymouth-quit-wait.service | 15 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index 23ea9794b5..a016ba2c68 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 plymouth-quit.service +After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service m4_ifdef(`TARGET_FEDORA', After=rc-local.service )m4_dnl diff --git a/units/plymouth-quit-wait.service b/units/plymouth-quit-wait.service new file mode 100644 index 0000000000..45c67bdabd --- /dev/null +++ b/units/plymouth-quit-wait.service @@ -0,0 +1,15 @@ +# 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 diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 4b031d7fba..82414ea664 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -8,13 +8,16 @@ [Unit] Description=Serial Getty on %I 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', After=rc-local.service )m4_dnl m4_ifdef(`TARGET_ARCH', After=rc-local.service )m4_dnl +m4_ifdef(`TARGET_FRUGALWARE', +After=local.service +)m4_dnl # If additional gettys are spawned during boot then we should make # sure that this is synchronized before getty.target, even though |