SVN: geninitrd/trunk/geninitrd

[adamg]

Author: adamg
Date: Wed Jun 25 17:56:11 2008
New Revision: 9823

Modified:
   geninitrd/trunk/geninitrd
Log:
- splash_geninitramfs_bin used to be in /usr/bin, support it

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Jun 25 17:56:11 2008
@@ -1239,6 +1239,8 @@
 		warn "Failed to find splash_geninitramfs. Is splashutils package installed?"
 		return
 	fi
+	splash_geninitramfs_bin=/usr/sbin/splash_geninitramfs
+	[ -f /usr/bin/splash_geninitramfs ] && splash_geninitramfs_bin=/usr/bin/splash_geninitramfs
 
 	if [ -r /etc/sysconfig/fbsplash ]; then
 		. /etc/sysconfig/fbsplash
@@ -1258,7 +1260,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_bin -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"
@@ -1273,6 +1275,8 @@
 		warn "Failed to find splash_geninitramfs. Is splashutils package installed?"
 		return
 	fi
+	splash_geninitramfs_bin=/usr/sbin/splash_geninitramfs
+	[ -f /usr/bin/splash_geninitramfs ] && splash_geninitramfs_bin=/usr/bin/splash_geninitramfs
 
 	if [ -r /etc/sysconfig/splash ]; then
 		. /etc/sysconfig/splash
@@ -1292,7 +1296,7 @@
 
 	for res in $FB_SPLASH_RESOLUTIONS; do
 		if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
-			/usr/sbin/splash_geninitramfs -c $DESTDIR -r $res $SPLASH_THEME && \
+			$splash_geninitramfs_bin -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"