From: Tim Yamin Date: Fri, 2 Apr 2004 20:27:42 +0000 (+0000) Subject: Fix for bug #46596; version header update. X-Git-Tag: v3.4.10.902~650 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a61f843f75154de93ccc7fd0dae179032e43c29;p=genkernel.git Fix for bug #46596; version header update. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@102 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/gen_initrd.sh b/gen_initrd.sh index f47a287..ee1f6ac 100644 --- a/gen_initrd.sh +++ b/gen_initrd.sh @@ -211,8 +211,8 @@ create_initrd() { then if [ -x /sbin/splash ] then - [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootplash.conf ] && source /etc/conf.d/bootsplash.conf - [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootplash ] && source /etc/conf.d/bootsplash + [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash.conf ] && source /etc/conf.d/bootsplash.conf + [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash ] && source /etc/conf.d/bootsplash [ -z "${BOOTSPLASH_THEME}" ] && BOOTSPLASH_THEME=default print_info 1 " >> Installing bootsplash [ using the ${BOOTSPLASH_THEME} theme ]..." for bootRes in '800x600' '1024x768' '1280x1024' '1600x1200' @@ -221,7 +221,7 @@ create_initrd() { then /sbin/splash -s -f /etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg >> ${TEMP}/initrd-loop || gen_die "Error: could not copy ${bootRes} bootsplash!" else - print_info 1 "splash: Did not find a bootplash for the ${bootRes} resolution..." + print_info 1 "splash: Did not find a bootsplash for the ${bootRes} resolution..." fi done else diff --git a/genkernel b/genkernel index 672bd35..fa1eb35 100755 --- a/genkernel +++ b/genkernel @@ -1,7 +1,7 @@ #!/bin/bash # Genkernel v3 -GK_V="3.0.2_rc1" +GK_V="3.0.2" TEMP="/var/tmp/genkernel" small_die() {