From d7a8930eb152b87d6a33ad94f322f4898e4b2860df1d58aa0cf213e86015960b Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 29 Sep 2011 16:16:35 +0000 Subject: [PATCH] Accepting request 85489 from home:fcrozat:systemd - Add services to stop bootsplash at end of startup and start it at beginning of shutdown. - Fix bootsplash call and ensure dependencies are set right. - Add services to stop bootsplash at end of startup and start it at beginning of shutdown. - Fix bootsplash call and ensure dependencies are set right. OBS-URL: https://build.opensuse.org/request/show/85489 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=203 --- bootsplash-quit.service | 10 ++++++++++ bootsplash-shutdown.service | 10 ++++++++++ bootsplash-startup.service | 2 +- systemd-bootsplash | 9 ++++++++- systemd-gtk.changes | 7 +++++++ systemd.changes | 7 +++++++ systemd.spec | 8 +++++++- 7 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 bootsplash-quit.service create mode 100644 bootsplash-shutdown.service diff --git a/bootsplash-quit.service b/bootsplash-quit.service new file mode 100644 index 00000000..b2908458 --- /dev/null +++ b/bootsplash-quit.service @@ -0,0 +1,10 @@ +[Unit] +Description=Terminate bootsplash +After=xdm.service rc-local.service bootsplash-startup.service +DefaultDependencies=no +Names=plymout-quit-wait.service + +[Service] +ExecStart=/lib/systemd/systemd-bootsplash 5 +Type=oneshot +RemainAfterExit=true diff --git a/bootsplash-shutdown.service b/bootsplash-shutdown.service new file mode 100644 index 00000000..76d4344c --- /dev/null +++ b/bootsplash-shutdown.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start bootsplash for shutdown/reboot +Before=shutdown.service halt.service +DefaultDependencies=no +ConditionKernelCommandLine=splash=silent + +[Service] +ExecStart=/lib/systemd/systemd-bootsplash 0 +Type=oneshot +RemainAfterExit=true diff --git a/bootsplash-startup.service b/bootsplash-startup.service index 8ed061fe..a10976c6 100644 --- a/bootsplash-startup.service +++ b/bootsplash-startup.service @@ -4,6 +4,6 @@ DefaultDependencies=no ConditionKernelCommandLine=splash=silent [Service] -ExecStart=/lib/system/systemd-bootsplash B +ExecStart=/lib/systemd/systemd-bootsplash 0 Type=oneshot RemainAfterExit=true diff --git a/systemd-bootsplash b/systemd-bootsplash index 653cbe7d..1f5839a5 100644 --- a/systemd-bootsplash +++ b/systemd-bootsplash @@ -1,3 +1,10 @@ #! /bin/bash . /etc/rc.splash $1 -splashtrigger "rlchange $1" +export RUNLEVEL=$1 +export PREVLEVEL=N +if [ "$1" == "5" ]; then + splashtrigger "rlreached $1" +else + splashtrigger "rlchange $1" + splashtrigger "coolo" +fi diff --git a/systemd-gtk.changes b/systemd-gtk.changes index f33c0c0b..81c87426 100644 --- a/systemd-gtk.changes +++ b/systemd-gtk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 29 16:08:33 UTC 2011 - fcrozat@suse.com + +- Add services to stop bootsplash at end of startup and start it at + beginning of shutdown. +- Fix bootsplash call and ensure dependencies are set right. + ------------------------------------------------------------------- Thu Sep 29 13:43:00 UTC 2011 - fcrozat@suse.com diff --git a/systemd.changes b/systemd.changes index f33c0c0b..81c87426 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 29 16:08:33 UTC 2011 - fcrozat@suse.com + +- Add services to stop bootsplash at end of startup and start it at + beginning of shutdown. +- Fix bootsplash call and ensure dependencies are set right. + ------------------------------------------------------------------- Thu Sep 29 13:43:00 UTC 2011 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 9709b4c9..f9f02fc6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -56,6 +56,8 @@ Source5: systemd-insserv_conf Source6: baselibs.conf Source7: systemd-bootsplash Source8: bootsplash-startup.service +Source9: bootsplash-quit.service +Source10: bootsplash-shutdown.service Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch @@ -151,7 +153,11 @@ mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrate install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators install -m755 %{S:7} %{buildroot}/lib/systemd/ -install -m644 %{S:8} %{buildroot}/lib/systemd/system/ +install -m644 %{S:8} %{S:9} %{S:10} %{buildroot}/lib/systemd/system/ +ln -s ../bootsplash-startup.service %{buildroot}/lib/systemd/system/basic.target.wants/ +ln -s ../bootsplash-quit.service %{buildroot}/lib/systemd/system/multi-user.target.wants/ +ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/shutdown.target.wants/ +ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/reboot.target.wants/ ln -s ../bin/systemd %{buildroot}/sbin/init ln -s ../bin/systemctl %{buildroot}/sbin/reboot ln -s ../bin/systemctl %{buildroot}/sbin/halt