mirror of
https://github.com/systemd/systemd.git
synced 2024-11-24 18:53:33 +08:00
unit: hook plymouth into the boot
https://bugzilla.redhat.com/show_bug.cgi?id=619922
This commit is contained in:
parent
1f31e8d3a6
commit
1310609b05
15
Makefile.am
15
Makefile.am
@ -188,7 +188,9 @@ dist_systemunit_DATA += \
|
|||||||
units/fedora/rc-local.service \
|
units/fedora/rc-local.service \
|
||||||
units/fedora/reboot.service \
|
units/fedora/reboot.service \
|
||||||
units/fedora/sysinit.service \
|
units/fedora/sysinit.service \
|
||||||
units/fedora/single.service
|
units/fedora/single.service \
|
||||||
|
units/fedora/plymouth-quit.service \
|
||||||
|
units/fedora/plymouth-shutdown.service
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if TARGET_SUSE
|
if TARGET_SUSE
|
||||||
@ -762,7 +764,8 @@ install-data-hook:
|
|||||||
if TARGET_FEDORA
|
if TARGET_FEDORA
|
||||||
$(MKDIR_P) -m 0755 \
|
$(MKDIR_P) -m 0755 \
|
||||||
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
|
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
|
||||||
$(DESTDIR)$(systemunitdir)/rescue.target.wants
|
$(DESTDIR)$(systemunitdir)/rescue.target.wants \
|
||||||
|
$(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants
|
||||||
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
|
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
|
||||||
rm -f display-manager.service && \
|
rm -f display-manager.service && \
|
||||||
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
|
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
|
||||||
@ -770,11 +773,15 @@ if TARGET_FEDORA
|
|||||||
rm -f prefdm.service && \
|
rm -f prefdm.service && \
|
||||||
$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
|
$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
|
||||||
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
|
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
|
||||||
rm -f rc-local.service && \
|
rm -f rc-local.service plymouth-quit.service && \
|
||||||
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \
|
||||||
|
$(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service )
|
||||||
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
|
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
|
||||||
rm -f single.service && \
|
rm -f single.service && \
|
||||||
$(LN_S) $(systemunitdir)/single.service single.service )
|
$(LN_S) $(systemunitdir)/single.service single.service )
|
||||||
|
( cd $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants && \
|
||||||
|
rm -f plymouth-shutdown.service && \
|
||||||
|
$(LN_S) $(systemunitdir)/plymouth-shutdown.service plymouth-shutdown.service )
|
||||||
( cd $(DESTDIR)$(systemunitdir) && \
|
( cd $(DESTDIR)$(systemunitdir) && \
|
||||||
rm -f local.service && \
|
rm -f local.service && \
|
||||||
$(LN_S) rc-local.service local.service )
|
$(LN_S) rc-local.service local.service )
|
||||||
|
17
units/fedora/plymouth-quit.service
Normal file
17
units/fedora/plymouth-quit.service
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# 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=Terminate Plymouth Boot Screen
|
||||||
|
After=getty@tty1.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=-/usr/bin/plymouth quit
|
||||||
|
Type=finish
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
21
units/fedora/plymouth-shutdown.service
Normal file
21
units/fedora/plymouth-shutdown.service
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# 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=Show Plymouth Shutdown Screen
|
||||||
|
After=getty@tty1.service prefdm.service
|
||||||
|
DefaultDependencies=no
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/sbin/plymouthd --mode=shutdown
|
||||||
|
ExecStartPost=-/usr/bin/plymouth --sysinit
|
||||||
|
ExecStartPost=-/usr/bin/plymouth --show-splash
|
||||||
|
ExecStartPost=-/usr/bin/plymouth message '--text=Shutting Down'
|
||||||
|
Type=forking
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=shutdown.target
|
@ -11,7 +11,7 @@ After=syslog.target haldaemon.service
|
|||||||
|
|
||||||
# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
|
# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
|
||||||
# avoid any races around that.
|
# avoid any races around that.
|
||||||
Conflicts=getty@tty1.service
|
Conflicts=getty@tty1.service plymouth-quit.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/X11/prefdm -nodaemon
|
ExecStart=/etc/X11/prefdm -nodaemon
|
||||||
|
Loading…
Reference in New Issue
Block a user