Redirect which output to /dev/null and put quotes around var in test

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

diff --git a/ChangeLog b/ChangeLog
index dd612e30b28935ede7d77b9096d706e3c6feac71..283fcaad90d647d4539d91ac4f0306d6af930e88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Redirect which output to /dev/null and put quotes around var in test
+
   29 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
   genkernel, ia64/modules_load, ppc/modules_load, ppc64/modules_load,
   um/modules_load, x86_64/modules_load:

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 659398dc9d7a10002f8af438dde235f56e6f3685..e80213add54a620d5154a8f885646927f4d2ca3a 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -212,8 +212,8 @@ append_mdadm(){
 }
 
 append_splash(){
-       splash_geninitramfs=`which splash_geninitramfs 2>1&`
-       if [ -x ${splash_geninitramfs} ]
+       splash_geninitramfs=`which splash_geninitramfs 2>/dev/null`
+       if [ -x "${splash_geninitramfs}" ]
        then
                [ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
                [ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default