Author: glen
Date: Tue Apr 22 16:41:24 2008
New Revision: 9716
Modified:
geninitrd/trunk/geninitrd
Log:
- let splash_geninitramfs be in /usr/sbin too
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Tue Apr 22 16:41:24 2008
@@ -1167,8 +1167,15 @@
return
fi
- if [ ! -x /usr/bin/splash_geninitramfs ]; then
- warn "Failed to execute /usr/bin/splash_geninitramfs. Is
splashutils package installed?"
+ local splash_geninitramfs
+ if [ -x /usr/bin/splash_geninitramfs ]; then
+ splash_geninitramfs=/usr/bin/splash_geninitramfs
+ elif [ -x /usr/sbin/splash_geninitramfs ]; then
+ splash_geninitramfs=/usr/sbin/splash_geninitramfs
+ fi
+
+ if [ -z "$splash_geninitramfs" ]; then
+ warn "Failed to find splash_geninitramfs. Is splashutils
package installed?"
return
fi
@@ -1190,7 +1197,7 @@
for res in $FB_SPLASH_RESOLUTIONS; do
if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
- /usr/bin/splash_geninitramfs -c $DESTDIR -r $res
$SPLASH_THEME && \
+ $splash_geninitramfs -c $DESTDIR -r $res $SPLASH_THEME
&& \
debug "Added $res $SPLASH_THEME theme to initramfs."
else
warn "/etc/splash/$SPLASH_THEME/$res.cfg doesn't exist,
skipped"
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
