From f2ca5c798630b91df3c3ebb2146128fd67eaa472 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Fri, 9 Jan 2004 22:35:05 +0000 Subject: [PATCH] more livecd goodness git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@121 d1e1f19c-881f-0410-ab34-b69fee027534 --- examples/isolinux-2.08-cdtar.tar.bz2 | Bin 0 -> 8199 bytes examples/x86-livecd-stage3-runscript.sh | 4 ++-- modules/targets.py | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 examples/isolinux-2.08-cdtar.tar.bz2 diff --git a/examples/isolinux-2.08-cdtar.tar.bz2 b/examples/isolinux-2.08-cdtar.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..681bdfe0fb7c1c959ac375b96edc10cff7a7fc50 GIT binary patch literal 8199 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 literal 0 HcmV?d00001 diff --git a/examples/x86-livecd-stage3-runscript.sh b/examples/x86-livecd-stage3-runscript.sh index 5a0ea431..ce6dfea3 100644 --- a/examples/x86-livecd-stage3-runscript.sh +++ b/examples/x86-livecd-stage3-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/examples/Attic/x86-livecd-stage3-runscript.sh,v 1.2 2004/01/09 01:12:25 drobbins Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/examples/Attic/x86-livecd-stage3-runscript.sh,v 1.3 2004/01/09 22:35:05 drobbins Exp $ die() { echo "$1" @@ -40,7 +40,7 @@ cdroot_setup) cdtar=$clst_livecd_stage3_cdtar [ "$cdtar" = "" ] && die "No livecd-stage3/cdtar specified (required)" - tar xpvf $cdtar -C $clst_cdroot_path || die "Couldn't extract cdtar $cdtar" + tar xjpvf $cdtar -C $clst_cdroot_path || die "Couldn't extract cdtar $cdtar" if [ "$clst_boot_kernel" = "" ] then echo "No boot/kernel setting defined, exiting." diff --git a/modules/targets.py b/modules/targets.py index 59602365..14dffbd3 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -256,7 +256,6 @@ class generic_stage_target(generic_target): except CatalystError: self.unbind() raise CatalystError,"Stage build aborting due to error." - pass def run(self): self.dir_setup() @@ -287,6 +286,8 @@ class generic_stage_target(generic_target): self.clean() if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage1","livecd-stage2"]: self.capture() + if self.settings["target"] in ["livecd-stage3"]: + self.cdroot_setup() class snapshot_target(generic_target): def __init__(self,myspec,addlargs): @@ -428,6 +429,23 @@ class livecd_stage3_target(generic_stage_target): self.valid_values.append("livecd-stage3/cdtar","livecd-stage3/clean") generic_stage_target.__init__(self,spec,addlargs) + def run_local(self): + try: + cmd(self.settings["livecd-stage3/runscript"]+" run","runscript failed") + except CatalystError: + self.unbind() + raise CatalystError,"Stage build aborting due to error." + + def preclean(self): + try: + cmd(self.settings["livecd-stage3/runscript"]+" preclean","preclean runscript failed.") + except: + self.unbind() + raise + + def cdroot_setup(self): + cmd(self.settings["livecd-stage3/runscript"]+" cdroot_setup","preclean runscript failed.") + def register(foo): foo.update({"stage1":stage1_target,"stage2":stage2_target,"stage3":stage3_target, "grp":grp_target,"livecd-stage1":livecd_stage1_target, -- 2.26.2