diff options
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | fixme | 6 | ||||
| -rw-r--r-- | units/fedora/plymouth-halt.service (renamed from units/fedora/plymouth-shutdown.service) | 6 | ||||
| -rw-r--r-- | units/fedora/plymouth-poweroff.service | 21 | ||||
| -rw-r--r-- | units/fedora/plymouth-reboot.service | 21 |
5 files changed, 62 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 3d33e79325..e4fcb43d4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/units/fedora/plymouth-shutdown.service b/units/fedora/plymouth-halt.service index da3acecd16..9b77c5d776 100644 --- a/units/fedora/plymouth-shutdown.service +++ b/units/fedora/plymouth-halt.service @@ -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 diff --git a/units/fedora/plymouth-poweroff.service b/units/fedora/plymouth-poweroff.service new file mode 100644 index 0000000000..538a0c5cc5 --- /dev/null +++ b/units/fedora/plymouth-poweroff.service @@ -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 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 diff --git a/units/fedora/plymouth-reboot.service b/units/fedora/plymouth-reboot.service new file mode 100644 index 0000000000..286c8abf6c --- /dev/null +++ b/units/fedora/plymouth-reboot.service @@ -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 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 |