SHA256
1
0
forked from pool/systemd

Accepting request 105639 from home:tittiatcoke

Enable plymouth integration

OBS-URL: https://build.opensuse.org/request/show/105639
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=248
This commit is contained in:
Frederic Crozat 2012-02-17 09:33:25 +00:00 committed by Git OBS Bridge
parent 106d0cab66
commit 06fb3180db
6 changed files with 9 additions and 90 deletions

View File

@ -1,15 +0,0 @@
[Unit]
Description=Terminate bootsplash
After=xdm.service rc-local.service bootsplash-startup.service
Before=getty@tty1.service
DefaultDependencies=no
Names=plymouth-quit-wait.service
ConditionFileIsExecutable=/sbin/splash
ConditionKernelCommandLine=splash=silent
ConditionKernelCommandLine=vga
[Service]
ExecStart=/lib/systemd/systemd-bootsplash 5
ExecStartPost=-/bin/kill -SIGRTMIN+21 1
Type=oneshot
RemainAfterExit=true

View File

@ -1,13 +0,0 @@
[Unit]
Description=Start bootsplash for shutdown/reboot
Before=shutdown.service halt.service
DefaultDependencies=no
ConditionFileIsExecutable=/sbin/splash
ConditionKernelCommandLine=splash=silent
ConditionKernelCommandLine=vga
[Service]
ExecStartPre=-/bin/kill -SIGRTMIN+20 1
ExecStart=/lib/systemd/systemd-bootsplash 0
Type=oneshot
RemainAfterExit=true

View File

@ -1,12 +0,0 @@
[Unit]
Description=Start bootsplash
DefaultDependencies=no
ConditionFileIsExecutable=/sbin/splash
ConditionKernelCommandLine=splash=silent
ConditionKernelCommandLine=vga
[Service]
ExecStartPre=-/bin/kill -SIGRTMIN+20 1
ExecStart=/lib/systemd/systemd-bootsplash 0
Type=oneshot
RemainAfterExit=true

View File

@ -1,21 +0,0 @@
#! /bin/bash
. /etc/rc.splash $1
export RUNLEVEL=$1
export PREVLEVEL=N
if [ "$1" == "5" ]; then
/bin/systemctl status --no-pager default.target | grep -q graphical.target
if [ $? -eq 0 ]; then
declare -i timeout
timeout=0
console=`fgconsole`
while [ $console -eq 1 -a $timeout -lt 30 ] ; do
sleep 1
timeout+=1
console=`fgconsole`
done
fi
splashtrigger "rlreached $1"
else
splashtrigger "rlchange $1"
splashtrigger "coolo"
fi

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 17 09:22:50 UTC 2012 - tittiatcoke@gmail.com
- Enable Plymouth integration.
* Bootsplash related files will be moved to the bootsplash
package
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com

View File

@ -16,8 +16,6 @@
# #
%define build_plymouth 0
#don't require python, use recommends (bnc#716939) #don't require python, use recommends (bnc#716939)
Name: systemd Name: systemd
@ -65,10 +63,6 @@ Source3: systemd-sysv-convert
Source4: macros.systemd Source4: macros.systemd
Source5: systemd-insserv_conf Source5: systemd-insserv_conf
Source6: baselibs.conf Source6: baselibs.conf
Source7: systemd-bootsplash
Source8: bootsplash-startup.service
Source9: bootsplash-quit.service
Source10: bootsplash-shutdown.service
# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
Source11: listen.conf Source11: listen.conf
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
@ -125,8 +119,6 @@ Provides: sysvinit:/sbin/init
%description sysvinit %description sysvinit
Drop-in replacement of System V init tools. Drop-in replacement of System V init tools.
%if %{build_plymouth}
%package plymouth %package plymouth
Summary: Plymouth support for systemd Summary: Plymouth support for systemd
Group: System/Base Group: System/Base
@ -135,7 +127,6 @@ Requires: plymouth
%description plymouth %description plymouth
Plymouth integration for systemd Plymouth integration for systemd
%endif
%prep %prep
%setup -q %setup -q
@ -187,12 +178,6 @@ 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
# do not install, code has been fixed, might be useful in the future # do not install, code has been fixed, might be useful in the future
#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 -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 ../lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../lib/systemd/systemd %{buildroot}/bin/systemd
ln -s ../lib/systemd/systemd %{buildroot}/sbin/init ln -s ../lib/systemd/systemd %{buildroot}/sbin/init
ln -s ../bin/systemctl %{buildroot}/sbin/reboot ln -s ../bin/systemctl %{buildroot}/sbin/reboot
@ -203,11 +188,8 @@ ln -s ../bin/systemctl %{buildroot}/sbin/telinit
ln -s ../bin/systemctl %{buildroot}/sbin/runlevel ln -s ../bin/systemctl %{buildroot}/sbin/runlevel
rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -rf %{buildroot}/etc/systemd/system/*.target.wants
rm -f %{buildroot}/etc/systemd/system/default.target rm -f %{buildroot}/etc/systemd/system/default.target
%if !%{build_plymouth} # Don't activate the plymouth-quit services in order to get a smooth transistion to the DM
rm -f %{buildroot}/lib/systemd/system/plymouth-*.service rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-quit*.service
rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-*.service
rm -f %{buildroot}/lib/systemd/system/systemd-ask-password-plymouth.*
%endif
# aliases for /etc/init.d/* # aliases for /etc/init.d/*
ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service
ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service
@ -248,10 +230,6 @@ install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/rsyslog.d/
# Create the /var/log/journal directory to change the volatile journal to a persistent one # Create the /var/log/journal directory to change the volatile journal to a persistent one
mkdir -p %{buildroot}/var/log/journal mkdir -p %{buildroot}/var/log/journal
%if %{build_plymouth}
(cd %{buildroot} && find . -name '*plymouth*') > files.plymouth
%endif
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%post %post
@ -367,12 +345,10 @@ rm -rf %{buildroot}
%{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
%{_datadir}/systemd %{_datadir}/systemd
%if %{build_plymouth}
# Packaged in plymouth subpackage # Packaged in plymouth subpackage
%exclude /lib/systemd/system/plymouth-*.service %exclude /lib/systemd/system/plymouth-*.service
%exclude /lib/systemd/system/*.wants/plymouth-*.service %exclude /lib/systemd/system/*.wants/plymouth-*.service
%exclude /lib/systemd/system/systemd-ask-password-plymouth.* %exclude /lib/systemd/system/systemd-ask-password-plymouth.*
%endif
# Packaged in gtk subpackage # Packaged in gtk subpackage
%exclude %{_mandir}/man1/systemadm.1* %exclude %{_mandir}/man1/systemadm.1*
# Packaged in sysvinit subpackage # Packaged in sysvinit subpackage
@ -423,14 +399,11 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libsystemd-id128.pc %{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc %{_libdir}/pkgconfig/libsystemd-journal.pc
%if %{build_plymouth}
%files plymouth %files plymouth
%defattr(-,root,root,-) %defattr(-,root,root,-)
/lib/systemd/system/plymouth-*.service /lib/systemd/system/plymouth-*.service
/lib/systemd/system/*.wants/plymouth-*.service /lib/systemd/system/*.wants/plymouth-*.service
/lib/systemd/system/systemd-ask-password-plymouth.* /lib/systemd/system/systemd-ask-password-plymouth.*
%endif
%files sysvinit %files sysvinit
%defattr(-,root,root,-) %defattr(-,root,root,-)