SHA256
1
0
forked from pool/systemd

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
This commit is contained in:
Frederic Crozat 2011-09-29 16:16:35 +00:00 committed by Git OBS Bridge
parent ad2bc9976d
commit d7a8930eb1
7 changed files with 50 additions and 3 deletions

10
bootsplash-quit.service Normal file
View File

@ -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

View File

@ -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

View File

@ -4,6 +4,6 @@ DefaultDependencies=no
ConditionKernelCommandLine=splash=silent ConditionKernelCommandLine=splash=silent
[Service] [Service]
ExecStart=/lib/system/systemd-bootsplash B ExecStart=/lib/systemd/systemd-bootsplash 0
Type=oneshot Type=oneshot
RemainAfterExit=true RemainAfterExit=true

View File

@ -1,3 +1,10 @@
#! /bin/bash #! /bin/bash
. /etc/rc.splash $1 . /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

View File

@ -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 Thu Sep 29 13:43:00 UTC 2011 - fcrozat@suse.com

View File

@ -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 Thu Sep 29 13:43:00 UTC 2011 - fcrozat@suse.com

View File

@ -56,6 +56,8 @@ Source5: systemd-insserv_conf
Source6: baselibs.conf Source6: baselibs.conf
Source7: systemd-bootsplash Source7: systemd-bootsplash
Source8: bootsplash-startup.service Source8: bootsplash-startup.service
Source9: bootsplash-quit.service
Source10: bootsplash-shutdown.service
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
# handle SUSE specific kbd settings # handle SUSE specific kbd settings
Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch 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:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators
install -m755 %{S:7} %{buildroot}/lib/systemd/ 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/systemd %{buildroot}/sbin/init
ln -s ../bin/systemctl %{buildroot}/sbin/reboot ln -s ../bin/systemctl %{buildroot}/sbin/reboot
ln -s ../bin/systemctl %{buildroot}/sbin/halt ln -s ../bin/systemctl %{buildroot}/sbin/halt