Hello community,
here is the log from the commit of package splashy
checked in at Wed Oct 17 15:09:28 CEST 2007.
--------
--- splashy/splashy.changes 2007-10-11 13:50:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/splashy/splashy.changes 2007-10-17 14:37:59.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 17 14:36:45 CEST 2007 - hmacht@suse.de
+
+- use giant if-clause to never ever return from a mkinitrd script
+ which would result in the initrd build process to fail
+ (according to novell bug 331785, comment 8)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ splashy.spec ++++++
--- /var/tmp/diff_new_pack.VG3198/_old 2007-10-17 15:07:49.000000000 +0200
+++ /var/tmp/diff_new_pack.VG3198/_new 2007-10-17 15:07:49.000000000 +0200
@@ -12,7 +12,7 @@
Name: splashy
Summary: A complete user-space boot splash system
Version: 0.3.5
-Release: 1
+Release: 5
License: GPL v2 or later
Group: System/Boot
Url: http://splashy.alioth.debian.org/wiki/doku.php
@@ -217,6 +217,10 @@
%config(noreplace) %{_sysconfdir}/splashy/themes/mepis_baghira
%config(noreplace) %{_sysconfdir}/splashy/themes/aqua
%changelog
+* Wed Oct 17 2007 - hmacht@suse.de
+- use giant if-clause to never ever return from a mkinitrd script
+ which would result in the initrd build process to fail
+ (according to novell bug 331785, comment 8)
* Thu Oct 11 2007 - hmacht@suse.de
Update to upstream 0.3.5:
- Make init scripts consistent. STEPS_DIR can be defined in
++++++ setup-splashy.sh ++++++
--- splashy/setup-splashy.sh 2007-09-11 14:19:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/splashy/setup-splashy.sh 2007-10-17 14:38:12.000000000 +0200
@@ -9,22 +9,23 @@
#%stage: setup
#
-[ ! -d /etc/splashy ] || [ ! -f /usr/sbin/resume ] && exit 0
-
-# find the current theme
-DUMMY=$(cat /etc/splashy/config.xml)
-THEME=$(echo $DUMMY | perl -p -e 's/<!--.*?-->//g;s/^.*//;s/<\/current_theme>.*$//;')
-if [ -z $THEME -o ! -d /etc/splashy/themes/$THEME ]; then
+# never even 'return' from a mkinitrd script, which would result in an
+# aborted initrd build process
+if [ -d /etc/splashy ] && [ -f /usr/sbin/resume ]; then
+ # find the current theme
+ DUMMY=$(cat /etc/splashy/config.xml)
+ THEME=$(echo $DUMMY | perl -p -e 's/<!--.*?-->//g;s/^.*//;s/<\/current_theme>.*$//;')
+ if [ -z $THEME -o ! -d /etc/splashy/themes/$THEME ]; then
echo "$0: warning, splashy theme not found in config file, using 'openSUSE'"
THEME=openSUSE
-fi
+ fi
-LIBDIR=lib
-if [ "`LANG=C LC_ALL=C file -b /usr/sbin/resume | awk '/^ELF ..-bit/ { print $2 }'`" = "64-bit" ]; then
- LIBDIR=lib64
-fi
+ LIBDIR=lib
+ if [ "`LANG=C LC_ALL=C file -b /usr/sbin/resume | awk '/^ELF ..-bit/ { print $2 }'`" = "64-bit" ]; then
+ LIBDIR=lib64
+ fi
-LIBS="\
+ LIBS="\
/usr/$LIBDIR/libdirect-1.0.so.0 \
/usr/$LIBDIR/libdirectfb-1.0.so.0 \
/usr/$LIBDIR/libfusion-1.0.so.0 \
@@ -36,30 +37,31 @@
/$LIBDIR/libm.so.6 \
/$LIBDIR/libz.so.1"
-SPLASHY_FILES="
+ SPLASHY_FILES="
/etc/splashy/config.xml \
/etc/splashy/themes/$THEME/*"
-for I in `directfb-config --libs --input=keyboard --imageprovider=jpeg,gif,png --font=ft2,default`; do
- F=`dirname -- $I`/`basename -- $I .o`.so
- if [ -f $F ]; then
- if [ ! -d $tmp_mnt/`dirname $F` ]; then
- mkdir -p $tmp_mnt/`dirname $F`
- fi
- cp -dp $F $tmp_mnt/$F
- fi
-done
-
-for I in $LIBS; do
- [ ! -d $tmp_mnt/`dirname $I` ] && mkdir -p $tmp_mnt/`dirname $I`
- cp -L $I $tmp_mnt/$I
-done
-
-for I in $SPLASHY_FILES; do
- [ ! -d $tmp_mnt/`dirname $I` ] && mkdir -p $tmp_mnt/`dirname $I`
- cp $I $tmp_mnt/$I
-done
+ for I in `directfb-config --libs --input=keyboard --imageprovider=jpeg,gif,png --font=ft2,default`; do
+ F=`dirname -- $I`/`basename -- $I .o`.so
+ if [ -f $F ]; then
+ if [ ! -d $tmp_mnt/`dirname $F` ]; then
+ mkdir -p $tmp_mnt/`dirname $F`
+ fi
+ cp -dp $F $tmp_mnt/$F
+ fi
+ done
+
+ for I in $LIBS; do
+ [ ! -d $tmp_mnt/`dirname $I` ] && mkdir -p $tmp_mnt/`dirname $I`
+ cp -L $I $tmp_mnt/$I
+ done
+
+ for I in $SPLASHY_FILES; do
+ [ ! -d $tmp_mnt/`dirname $I` ] && mkdir -p $tmp_mnt/`dirname $I`
+ cp $I $tmp_mnt/$I
+ done
+fi
# never exit with nonzero, so we never cause mkinitrd to abort
# - not having splash during resume is ugly, not booting is evil.
# do not exit here - this script is sourced!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org