Skip to content

Commit 42eacda

Browse files
poetteringpoettering
committed
units: introduce plymouth-start and plymouth-kexec, and move a few things back from basic to sysinit
1 parent c19a873 commit 42eacda

File tree

7 files changed

+64
-19
lines changed

7 files changed

+64
-19
lines changed

‎Makefile.am‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,10 @@ dist_systemunit_DATA += \
300300
units/fedora/rc-local.service \
301301
units/fedora/halt-local.service \
302302
units/fedora/single.service \
303+
units/fedora/plymouth-start.service \
303304
units/fedora/plymouth-quit.service \
304305
units/fedora/plymouth-reboot.service \
306+
units/fedora/plymouth-kexec.service \
305307
units/fedora/plymouth-poweroff.service \
306308
units/fedora/plymouth-halt.service
307309
endif
@@ -1035,6 +1037,7 @@ install-data-hook:
10351037
$(MKDIR_P) -m 0755 \
10361038
$(DESTDIR)$(systemunitdir) \
10371039
$(DESTDIR)$(sessionunitdir) \
1040+
$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
10381041
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
10391042
$(DESTDIR)$(systemunitdir)/basic.target.wants \
10401043
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
@@ -1047,10 +1050,9 @@ install-data-hook:
10471050
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
10481051
$(DESTDIR)$(systemunitdir)/graphical.target.wants \
10491052
$(DESTDIR)$(pkgsysconfdir)/system \
1050-
$(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
1053+
$(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
10511054
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
10521055
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
1053-
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
10541056
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
10551057
$(DESTDIR)$(pkgsysconfdir)/session \
10561058
$(DESTDIR)$(sysconfdir)/xdg/systemd
@@ -1137,10 +1139,10 @@ install-data-hook:
11371139
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
11381140
rm -f remote-fs.target && \
11391141
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
1140-
( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
1142+
( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
11411143
rm -f hwclock-load.service && \
11421144
$(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
1143-
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
1145+
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
11441146
rm -f dev-hugepages.automount \
11451147
dev-mqueue.automount \
11461148
proc-sys-fs-binfmt_misc.automount \
@@ -1150,8 +1152,7 @@ install-data-hook:
11501152
systemd-modules-load.service \
11511153
systemd-random-seed-load.service \
11521154
systemd-tmpfiles-setup.service \
1153-
sysctl.service \
1154-
systemd-tmpfiles-clean.timer && \
1155+
sysctl.service && \
11551156
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
11561157
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
11571158
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@ -1161,7 +1162,9 @@ install-data-hook:
11611162
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
11621163
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
11631164
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
1164-
$(LN_S) ../sysctl.service sysctl.service && \
1165+
$(LN_S) ../sysctl.service sysctl.service )
1166+
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
1167+
rm -f systemd-tmpfiles-clean.timer && \
11651168
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
11661169
( cd $(DESTDIR)$(dbussessionservicedir) && \
11671170
rm -f org.freedesktop.systemd1.service && \
@@ -1170,10 +1173,10 @@ if TARGET_FEDORA
11701173
$(MKDIR_P) -m 0755 \
11711174
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
11721175
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
1176+
$(DESTDIR)$(systemunitdir)/kexec.target.wants \
11731177
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
11741178
$(DESTDIR)$(systemunitdir)/halt.target.wants \
11751179
$(DESTDIR)$(systemunitdir)/rescue.target.wants \
1176-
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
11771180
$(DESTDIR)$(systemunitdir)/final.target.wants
11781181
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
11791182
rm -f rc-local.service && \
@@ -1185,12 +1188,18 @@ if TARGET_FEDORA
11851188
rm -f single.service && \
11861189
$(LN_S) $(systemunitdir)/single.service single.service )
11871190
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
1188-
rm -f plymouth-quit.service systemd-ask-password-plymouth.path && \
1189-
$(LN_S) ../plymouth-quit.service plymouth-quit.service && \
1191+
rm -f plymouth-quit.service && \
1192+
$(LN_S) ../plymouth-quit.service plymouth-quit.service )
1193+
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
1194+
rm -f plymouth-start.service systemd-ask-password-plymouth.path && \
1195+
$(LN_S) ../plymouth-start.service plymouth-start.service && \
11901196
$(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
11911197
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
11921198
rm -f plymouth-reboot.service && \
11931199
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
1200+
( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
1201+
rm -f plymouth-kexec.service && \
1202+
$(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
11941203
( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
11951204
rm -f plymouth-poweroff.service && \
11961205
$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
@@ -1205,12 +1214,12 @@ if TARGET_FEDORA
12051214
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
12061215
endif
12071216
if TARGET_GENTOO
1208-
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
1217+
( cd $(DESTDIR)$(systemunitdir) && \
12091218
rm -f display-manager.service && \
1210-
$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
1211-
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
1212-
rm -f xdm.service && \
1213-
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
1219+
$(LN_S) xdm.service display-manager.service )
1220+
( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
1221+
rm -f display-manager.service && \
1222+
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
12141223
endif
12151224
if TARGET_DEBIAN_OR_UBUNTU
12161225
$(MKDIR_P) -m 0755 \

‎units/fedora/plymouth-halt.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[Unit]
99
Description=Show Plymouth Halt Screen
10-
After=getty@tty1.service prefdm.service
10+
After=getty@tty1.service prefdm.service plymouth-start.service
1111
Before=halt.service
1212
DefaultDependencies=no
1313

‎units/fedora/plymouth-kexec.service‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file is part of systemd.
2+
#
3+
# systemd is free software; you can redistribute it and/or modify it
4+
# under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 2 of the License, or
6+
# (at your option) any later version.
7+
8+
[Unit]
9+
Description=Show Plymouth Reboot with kexec Screen
10+
After=getty@tty1.service prefdm.service plymouth-start.service
11+
Before=kexec.service
12+
DefaultDependencies=no
13+
14+
[Service]
15+
ExecStart=/sbin/plymouthd --mode=shutdown
16+
ExecStartPost=-/usr/bin/plymouth --sysinit
17+
ExecStartPost=-/usr/bin/plymouth --show-splash
18+
ExecStartPost=-/usr/bin/plymouth message '--text=Rebooting with kexec...'
19+
Type=forking

‎units/fedora/plymouth-poweroff.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[Unit]
99
Description=Show Plymouth Power Off Screen
10-
After=getty@tty1.service prefdm.service
10+
After=getty@tty1.service prefdm.service plymouth-start.service
1111
Before=poweroff.service
1212
DefaultDependencies=no
1313

‎units/fedora/plymouth-quit.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[Unit]
99
Description=Terminate Plymouth Boot Screen
1010
Before=getty@tty1.service
11-
After=dev-tty1.device rc-local.service
11+
After=dev-tty1.device rc-local.service plymouth-start.service
1212

1313
[Service]
1414
ExecStart=-/usr/bin/plymouth quit

‎units/fedora/plymouth-reboot.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[Unit]
99
Description=Show Plymouth Reboot Screen
10-
After=getty@tty1.service prefdm.service
10+
After=getty@tty1.service prefdm.service plymouth-start.service
1111
Before=reboot.service
1212
DefaultDependencies=no
1313

‎units/fedora/plymouth-start.service‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is part of systemd.
2+
#
3+
# systemd is free software; you can redistribute it and/or modify it
4+
# under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 2 of the License, or
6+
# (at your option) any later version.
7+
8+
[Unit]
9+
Description=Show Plymouth Boot Screen
10+
DefaultDependencies=no
11+
After=systemd-vconsole-setup.service
12+
Before=systemd-ask-password-plymouth.service
13+
14+
[Service]
15+
ExecStart=/sbin/plymouthd --mode=boot --attach-to-session
16+
ExecStartPost=-/usr/bin/plymouth --show-splash
17+
Type=forking

0 commit comments

Comments
 (0)