Author: glen
Date: Mon Nov 5 09:15:59 2007
New Revision: 8990
Modified:
geninitrd/trunk/geninitrd
Log:
- less deeper conditions
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Mon Nov 5 09:15:59 2007
@@ -1518,24 +1518,29 @@
if [ ! -x /usr/bin/splash_geninitramfs ]; then
echo >&2 "Failed to execute /usr/bin/splash_geninitramfs. Is
splashutils package installed?"
- elif [ -z "$SPLASH_THEME" ]; then
+ return
+ fi
+
+ if [ -z "$SPLASH_THEME" ]; then
echo >&2 "Please configure your /etc/sysconfig/fbsplash first."
echo >&2 "Generating fbsplashes skipped."
- else
- if [ -n "$FB_SPLASH_RESOLUTIONS" ]; then
- for res in $FB_SPLASH_RESOLUTIONS; do
- if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ];
then
- /usr/bin/splash_geninitramfs -c
$MNTIMAGE -r $res $SPLASH_THEME && \
- debug "Added $res $SPLASH_THEME theme
to initramfs."
- else
- echo >&2
"/etc/splash/$SPLASH_THEME/$res.cfg doesn't exist, skipped"
- fi
- done
+ return
+ fi
+
+ if [ -z "$FB_SPLASH_RESOLUTIONS" ]; then
+ echo >&2 "No FB_SPLASH_RESOLUTIONS specified in
/etc/sysconfig/fbsplash."
+ echo >&2 "Not adding fbsplash to initramfs."
+ return
+ fi
+
+ for res in $FB_SPLASH_RESOLUTIONS; do
+ if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
+ /usr/bin/splash_geninitramfs -c $MNTIMAGE -r $res
$SPLASH_THEME && \
+ debug "Added $res $SPLASH_THEME theme to initramfs."
else
- echo >&2 "No FB_SPLASH_RESOLUTIONS specified in
/etc/sysconfig/fbsplash."
- echo >&2 "Not adding fbsplash to initramfs."
+ echo >&2 "/etc/splash/$SPLASH_THEME/$res.cfg doesn't
exist, skipped"
fi
- fi
+ done
}
# Generates /dev nodes based on /proc/partitions information.
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
