Commit 0278dfeb authored by Lennart Poettering's avatar Lennart Poettering
Browse files

unit: create three seperate plymouth service for halt/poweroff/reboot

parent 75676b72
......@@ -195,7 +195,9 @@ dist_systemunit_DATA += \
units/fedora/sysinit.service \
units/fedora/single.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-shutdown.service
units/fedora/plymouth-reboot.service \
units/fedora/plymouth-poweroff.service \
units/fedora/plymouth-halt.service
endif
if TARGET_SUSE
......@@ -820,7 +822,9 @@ install-data-hook:
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/reboot.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants \
$(DESTDIR)$(systemunitdir)/rescue.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
......@@ -835,9 +839,15 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
rm -f 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)$(pkgsysconfdir)/system/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) $(systemunitdir)/plymouth-reboot.service plymouth-reboot.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/poweroff.target.wants && \
rm -f plymouth-poweroff.service && \
$(LN_S) $(systemunitdir)/plymouth-poweroff.service plymouth-poweroff.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/halt.target.wants && \
rm -f plymouth-halt.service && \
$(LN_S) $(systemunitdir)/plymouth-halt.service plymouth-halt.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
......
......@@ -67,16 +67,14 @@
* j->installed issue
* plymouth boot.log
* plymouth different shut down msgs
* plymouth after/before getty?
* be more forgiving when parsing unit files, when encountering incorrect lines with non assignments
* ExecStart= mehrfach bei Type=finish
* move runlevel symlinks to /lib
External:
* sysv functions should color when stdout is tty, not stdin
......
......@@ -6,7 +6,7 @@
# (at your option) any later version.
[Unit]
Description=Show Plymouth Shutdown Screen
Description=Show Plymouth Halt Screen
After=getty@tty1.service prefdm.service
DefaultDependencies=no
......@@ -14,8 +14,8 @@ DefaultDependencies=no
ExecStart=/sbin/plymouthd --mode=shutdown
ExecStartPost=-/usr/bin/plymouth --sysinit
ExecStartPost=-/usr/bin/plymouth --show-splash
ExecStartPost=-/usr/bin/plymouth message '--text=Shutting Down'
ExecStartPost=-/usr/bin/plymouth message '--text=Halting...'
Type=forking
[Install]
WantedBy=shutdown.target
WantedBy=halt.target
# 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 Power Off 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=Powering Off...'
Type=forking
[Install]
WantedBy=poweroff.target
# 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 Reboot 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=Rebooting...'
Type=forking
[Install]
WantedBy=reboot.target
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