Use which to determine the location of splash_geninitramfs, rather than having an endless number of conditional checks for the location. This fixes bug #211521. Thanks to Uriy Zhuravlev <stalkerg@gmail.com> for finding the problem and suggesting a solution.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@605 67a159dc-881f-0410-a524-ba9dfbe2cb84

ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  generic/linuxrc:
+  Use which to determine the location of splash_geninitramfs, rather than
+  having an endless number of conditional checks for the location. This fixes
+  bug #211521. Thanks to Uriy Zhuravlev <stalkerg@gmail.com> for finding the
+  problem and suggesting a solution.
+
   20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   -xenU/kernel-config-2.6, -xen0/kernel-config-2.6, genkernel,
   -xen0/busy-config, -xen0/config.sh, -xen0/modules_load, -xenU/busy-config,

gen_initramfs.sh

@@ -212,7 +212,8 @@ append_mdadm(){
 }
 
 append_splash(){
-	if [ -x /usr/bin/splash_geninitramfs ] || [ -x /sbin/splash_geninitramfs ]
+	splash_geninitramfs=`which splash_geninitramfs 2>1&`
+	if [ -x ${splash_geninitramfs} ]
 	then
 		[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
 		[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default

generic/linuxrc

@@ -39,7 +39,7 @@ fi
 
 quiet_kmsg
 
-CMDLINE="`cat /proc/cmdline`"
+CMDLINE=`cat /proc/cmdline`
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 REAL_ROOT=''
 FAKE_ROOT=''