Accepting request 123570 from Base:System

Create the correct default setup so that we have a plymouth bootsplash after installing openSUSE

OBS-URL: https://build.opensuse.org/request/show/123570
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=11
This commit is contained in:
Stephan Kulow 2012-06-05 10:02:59 +00:00 committed by Git OBS Bridge
commit e1b581177b
2 changed files with 10 additions and 17 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jun 4 18:34:08 UTC 2012 - tittiatcoke@gmail.com
- Ensure that the openSUSE theme is default. (bnc#765277)
- Remove unnecessary changes to the kernel options. Plymouth also
accepts splash=silent.
-------------------------------------------------------------------
Wed May 30 16:41:02 UTC 2012 - vuntz@opensuse.org

View File

@ -324,7 +324,7 @@ plugin.
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
# Change the default theme
sed -i -e 's/fade-in/solar/g' src/plymouthd.defaults
sed -i -e 's/fade-in/openSUSE/g' src/plymouthd.defaults
%build
autoreconf -fiv
@ -369,6 +369,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/plymouth
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration
cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth
cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png
cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf
mkdir -p %{buildroot}/lib/mkinitrd/scripts
install -t %{buildroot}/lib/mkinitrd/scripts \
@ -387,28 +388,12 @@ rm -rf %{buildroot}
if [ ! -e /.buildenv ]; then
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
%{_libexecdir}/plymouth/plymouth-update-initrd
if [ $1 -eq 1 ]; then
if [ -f %{_sysconfdir}/default/grub ]; then
sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
grub2-mkconfig -o /boot/grub2/grub.cfg
fi
if [ -f /boot/grub/menu.lst ]; then
sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
fi
fi
fi
%postun
if [ $1 -eq 0 ]; then
rm -f %{_libdir}/plymouth/default.so
rm -f /boot/initrd-plymouth.img
if [ -f %{_sysconfdir}/default/grub ]; then
sed -i 's|splash|splash=silent|g' %{_sysconfdir}/default/grub
grub2-mkconfig -o /boot/grub2/grub.cfg
fi
if [ -f /boot/grub/menu.lst ]; then
sed -i 's|splash|splash=silent|g' /boot/grub/menu.lst
fi
fi
%post scripts -p /sbin/mkinitrd_setup
@ -501,6 +486,7 @@ fi
%dir %{_libdir}/plymouth
%dir %{_libdir}/plymouth/renderers
%dir %{_sysconfdir}/plymouth
%{_sysconfdir}/plymouth/plymouth.conf
%{plymouthdaemon_execdir}/plymouthd
%{plymouthclient_execdir}/plymouth
/bin/plymouth