From 09308ee437537163caf3ef456dcd2e96ad17329b Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Sat, 22 May 2004 05:51:06 +0000 Subject: [PATCH] added bootsplash stuff git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@382 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- livecd/runscript-support/kmerge.sh | 12 +++++++++--- livecd/runscript-support/livecdfs-update.sh | 13 ++++++++++++- modules/livecd_stage2_target.py | 4 ++-- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 764753e7..5aa708f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.53 2004/05/22 00:42:59 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.54 2004/05/22 05:51:06 zhen Exp $ + + 22 May 2004; John Davis + livecd/runscript-support/kmerge.sh, + livecd/runscript-support/livecdfs-update.sh, + modules/livecd_stage2_target.py: + added key livecd/bootsplash 21 May 2004; John Davis arch/sparc.py, arch/sparc64.py, livecd/runscript/sparc-archscript.sh, diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh index 2bb283b9..3fe4be9d 100755 --- a/livecd/runscript-support/kmerge.sh +++ b/livecd/runscript-support/kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.4 2004/05/18 17:56:56 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.5 2004/05/22 05:51:06 zhen Exp $ die() { echo "$1" @@ -48,8 +48,14 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"` clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV} -genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1 - +if [ -n "${clst_livecd_bootsplash}" ] +then + BOOTSPLASH_THEME="${clst_livecd_bootsplash}" genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1 +else + genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1 +fi + +${genkernel} #now we merge any kernel-dependent packages if [ -e /var/tmp/${clst_kname}.packages ] then diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index a05e89b4..f0c77f1f 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.2 2004/05/18 02:09:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.3 2004/05/22 05:51:06 zhen Exp $ /usr/sbin/env-update source /etc/profile @@ -60,3 +60,14 @@ if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] then sed -i -e 's/^##GREETING/Welcome to the Gentoo Linux Minimal Installation LiveCD!/' /etc/motd fi + +# setup bootsplash (if called for) +if [ -n ${clst_livecd_bootsplash} ] +then + if [ -d /etc/bootsplash/${clst_livecd_bootsplash} ] + then + sed -i 's/BOOTSPLASH_THEME=\"gentoo\"/\"${clst_livecd_bootsplash}\"/' /etc/conf.d/bootsplash + else + exit 1 + fi +fi diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 8d00a7ba..65a48b7c 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Distributed under the GNU General Public License version 2 # Copyright 2003-2004 Gentoo Technologies, Inc. -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.6 2004/05/21 15:28:05 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.7 2004/05/22 05:51:06 zhen Exp $ """ Builder class for a LiveCD stage2 build. @@ -29,7 +29,7 @@ class livecd_stage2_target(generic_stage_target): self.valid_values.append("boot/kernel/"+x+"/use") self.valid_values.append("boot/kernel/"+x+"/gk_kernargs") self.valid_values.extend(self.required_values) - self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type","livecd/motd","livecd/overlay","livecd/modblacklist"]) + self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type","livecd/motd","livecd/overlay","livecd/modblacklist","livecd/bootsplash"]) generic_stage_target.__init__(self,spec,addlargs) file_locate(self.settings, ["livecd/cdtar","livecd/archscript","livecd/runscript"]) -- 2.26.2