commit plymouth for openSUSE:Factory
Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-03-29 15:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2012-03-26 12:18:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-03-29 15:03:53.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Mar 29 09:36:32 UTC 2012 - tittiatcoke@gmail.com + +- Ensure that both grub and grub2 are adjusted with regards to the + splash parameter. Running grub2-mkconfig to have the right + configuration. +- Installation of themes are not causing any reset of the selected + default theme anymore. Now this only happens when a theme is + installed and the default theme is set to TEXT. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.22Tmpt/_old 2012-03-29 15:03:55.000000000 +0200 +++ /var/tmp/diff_new_pack.22Tmpt/_new 2012-03-29 15:03:55.000000000 +0200 @@ -347,6 +347,10 @@ 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 @@ -356,6 +360,10 @@ 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 @@ -375,15 +383,19 @@ %postun -n libply2 -p /sbin/ldconfig %post theme-spinfinity -export LIB=%{_libdir} -%{_sbindir}/plymouth-set-default-theme spinfinity -if [ -x /sbin/mkinitrd ]; then +if [ $1 -eq 1 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + %{_sbindir}/plymouth-set-default-theme spinfinity + if [ -x /sbin/mkinitrd ]; then /sbin/mkinitrd + fi + fi fi %postun theme-spinfinity -export LIB=%{_libdir} if [ $1 -eq 0 ]; then + export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then %{_sbindir}/plymouth-set-default-theme --reset /sbin/mkinitrd @@ -391,15 +403,19 @@ fi %post theme-fade-in -export LIB=%{_libdir} -%{_sbindir}/plymouth-set-default-theme fade-in -if [ -x /sbin/mkinitrd ]; then +if [ $1 -eq 1 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + %{_sbindir}/plymouth-set-default-theme fade-in + if [ -x /sbin/mkinitrd ]; then /sbin/mkinitrd + fi + fi fi %postun theme-fade-in -export LIB=%{_libdir} if [ $1 -eq 0 ]; then + export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then %{_sbindir}/plymouth-set-default-theme --reset /sbin/mkinitrd @@ -407,15 +423,19 @@ fi %post theme-solar -export LIB=%{_libdir} -%{_sbindir}/plymouth-set-default-theme solar -if [ -x /sbin/mkinitrd ]; then +if [ $1 -eq 1 ]; then + export LIB=%{_libdir} + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then + %{_sbindir}/plymouth-set-default-theme solar + if [ -x /sbin/mkinitrd ]; then /sbin/mkinitrd + fi + fi fi %postun theme-solar -export lib=%{_libdir} if [ $1 -eq 0 ]; then + export lib=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then %{_sbindir}/plymouth-set-default-theme --reset /sbin/mkinitrd -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de