diff --git a/ChangeLog b/ChangeLog index dd612e3..283fcaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Feb 2008; Andrew Gaffney gen_initramfs.sh: + Redirect which output to /dev/null and put quotes around var in test + 29 Feb 2008; Chris Gianelloni 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 659398d..e80213a 100644 --- 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