Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
steam
systemd
Commits
aa2e2115
Commit
aa2e2115
authored
Feb 24, 2011
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
units: synchronize gettys to plymouth even if plymouth is killed by gdm
parent
2e0d98fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
8 deletions
+34
-8
Makefile.am
Makefile.am
+12
-6
TODO
TODO
+2
-0
units/getty@.service.m4
units/getty@.service.m4
+1
-1
units/plymouth-quit-wait.service
units/plymouth-quit-wait.service
+15
-0
units/serial-getty@.service.m4
units/serial-getty@.service.m4
+4
-1
No files found.
Makefile.am
View file @
aa2e2115
...
...
@@ -243,7 +243,6 @@ dist_systemunit_DATA = \
units/systemd-tmpfiles-clean.timer
\
units/quotaon.service
\
units/systemd-ask-password-wall.path
\
units/systemd-ask-password-plymouth.path
\
units/systemd-ask-password-console.path
nodist_systemunit_DATA
=
\
...
...
@@ -270,7 +269,6 @@ nodist_systemunit_DATA = \
units/systemd-tmpfiles-clean.service
\
units/systemd-user-sessions.service
\
units/systemd-ask-password-wall.service
\
units/systemd-ask-password-plymouth.service
\
units/systemd-ask-password-console.service
\
units/systemd-sysctl.service
\
units/syslog.target
\
...
...
@@ -316,7 +314,6 @@ EXTRA_DIST = \
units/systemd-tmpfiles-clean.service.in
\
units/systemd-user-sessions.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-sysctl.service.in
\
units/syslog.target.in
\
...
...
@@ -343,10 +340,18 @@ dist_systemunit_DATA += \
units/plymouth-start.service
\
units/plymouth-read-write.service
\
units/plymouth-quit.service
\
units/plymouth-quit-wait.service
\
units/plymouth-reboot.service
\
units/plymouth-kexec.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
dist_doc_DATA
=
\
...
...
@@ -1302,8 +1307,9 @@ if HAVE_PLYMOUTH
$(LN_S)
../plymouth-start.service
plymouth-start.service
&&
\
$(LN_S)
../plymouth-read-write.service
plymouth-read-write.service
)
(
cd
$(DESTDIR)$(systemunitdir)/multi-user.target.wants
&&
\
rm
-f
plymouth-quit.service
&&
\
$(LN_S)
../plymouth-quit.service
plymouth-quit.service
)
rm
-f
plymouth-quit.service
plymouth-quit-wait.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
&&
\
rm
-f
plymouth-reboot.service
&&
\
$(LN_S)
../plymouth-reboot.service
plymouth-reboot.service
)
...
...
TODO
View file @
aa2e2115
...
...
@@ -17,6 +17,8 @@ F15:
* NFS, networkmanager ordering issue
* Make systemd-cryptsetup cancellable
Features:
* introduce simple way to do mandatory conditions
...
...
units/getty@.service.m4
View file @
aa2e2115
...
...
@@ -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
...
...
units/plymouth-quit-wait.service
0 → 100644
View file @
aa2e2115
# 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
units/serial-getty@.service.m4
View file @
aa2e2115
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment