From 027445838f8a8eef894566b88bfe4617ee9f84f0 Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Wed, 19 May 2004 12:40:03 +0000 Subject: [PATCH] notables: livecd/overlay git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@378 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- livecd/runscript/default-runscript.sh | 3 +-- livecd/runscript/x86-archscript.sh | 4 ++-- modules/livecd_stage2_target.py | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b35008c7..9f8e7cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # 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.50 2004/05/18 02:09:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.51 2004/05/19 12:40:03 zhen Exp $ + + 19 May 2004; John Davis + livecd/runscript/default-runscript.sh, modules/livecd_stage2_target.py, + livecd/runscript/x86-archscript.sh: + added support for livecd/overlay, changed vga=0x317 to vga=791 + in the x86 archscript as it is a more standard setting and should + work on more hardware 17 May 2004; John Davis livecd/runscript/default-runscript.sh, livecd/runscript/x86-archscript.sh, diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh index ab4907c1..5c3d2d94 100644 --- a/livecd/runscript/default-runscript.sh +++ b/livecd/runscript/default-runscript.sh @@ -1,6 +1,6 @@ # 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/Attic/default-runscript.sh,v 1.10 2004/05/18 02:09:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.11 2004/05/19 12:40:03 zhen Exp $ #return codes to be used by archscript die() { @@ -172,7 +172,6 @@ case $1 in ;; iso) - mkdir ${clst_cdroot_path}/docs ;; esac exit 0 diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 7c28432d..9c0577b0 100644 --- a/livecd/runscript/x86-archscript.sh +++ b/livecd/runscript/x86-archscript.sh @@ -1,6 +1,6 @@ # 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/Attic/x86-archscript.sh,v 1.6 2004/05/18 02:09:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.7 2004/05/19 12:40:03 zhen Exp $ case $1 in kernel) @@ -60,7 +60,7 @@ case $1 in echo >> $icfg echo "label $x" >> $icfg echo " kernel $x" >> $icfg - echo " append initrd=$x.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=0x317 splash=silent" >> $icfg + echo " append initrd=$x.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> $icfg echo >> $icfg echo " $x" >> $kmsg echo "label $x-nofb" >> $icfg diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 9d70291d..43b34e2c 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.3 2004/05/18 02:09:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.4 2004/05/19 12:40:03 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/readme"]) + self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge","livecd/iso","livecd/gk_mainargs","livecd/type","livecd/motd","livecd/overlay"]) generic_stage_target.__init__(self,spec,addlargs) file_locate(self.settings, ["livecd/cdtar","livecd/archscript","livecd/runscript"]) @@ -89,6 +89,9 @@ class livecd_stage2_target(generic_stage_target): def cdroot_setup(self): cmd("/bin/bash "+self.settings["livecd/runscript"]+" cdfs","cdfs runscript failed.") + if self.settings.has_key("livecd/overlay"): + cmd("/bin/cp -a "+self.settings["livecd/overlay"]+"/* "+self.settings["cdroot_path"], + "LiveCD overlay copy failed.") if self.settings.has_key("livecd/iso"): cmd("/bin/bash "+self.settings["livecd/runscript"]+" iso "+self.settings["livecd/iso"],"iso runscript failed.") print "livecd-stage2: complete!" -- 2.26.2