Use which to determine the location of splash_geninitramfs, rather than having an...

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

diff --git a/ChangeLog b/ChangeLog
index c79906f1cd4e95004e4aef92b93338c9f6a49cd4..2a6bb80ac8615c472188ce5688df1868b036d7cc 100644 (file)
--- a/ChangeLog
+++ b/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,

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2d4994bfc825087b85d82b0316fd9eccfc56d5cc..72809824ed647d802b0c670739d3241acdc5ea6e 100644 (file)
--- a/gen_initramfs.sh
+++ b/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

diff --git a/generic/linuxrc b/generic/linuxrc
index 9bc6ec3f8e64f8a38bab8f3cf50de57c50a96fd2..ecac4f227d7fc62d35a55e33aa41e2dc3db01da6 100644 (file)
--- a/generic/linuxrc
+++ b/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=''