new key, fsscript

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@391 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 4a23849ae3e68cf81c1320dbfdb7e5664de94ed4..677b689cae6a89e15496ee1d3bf5fba4ef357e23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2004/06/10 15:55:11 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.62 2004/06/11 19:06:37 zhen Exp $
+
+  11 Jun 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/default-runscript.sh, modules/livecd_stage2_target.py:
+  new key, livecd/fsscript. use this to run commands in the livecdfs before it
+  is made into an iso
 
   10 Jun 2004; John Davis <zhen@gentoo.org>
   livecd/runscript-support/kmerge.sh,

diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh
index 74e36b17660ce51d649682069a9d840f6f80a8f9..c2de578b51ed13f64ad9a869d51162aca38198f4 100644 (file)
--- 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.12 2004/05/27 16:41:36 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.13 2004/06/11 19:06:37 zhen Exp $
 
 #return codes to be used by archscript
 die() {
@@ -135,6 +135,14 @@ case $1 in
                cp ${clst_sharedir}/livecd/runscript-support/livecdfs-update.sh ${clst_chroot_path}/tmp
                ${clst_CHROOT} ${clst_chroot_path} /tmp/livecdfs-update.sh || exit 1
                rm -f ${clst_chroot_path}/tmp/livecdfs-update.sh
+               
+               # if the user has their own fs update script, execute it
+               if [ -n "${clst_livecd_fsscript}" ]
+               then
+                       cp ${clst_livecd_fsscript} ${clst_chroot_path}/tmp/fsscript.sh
+                       ${clst_CHROOT} ${clst_chroot_path} /tmp/fsscript.sh || exit 1
+                       rm -f ${clst_chroot_path}/tmp/fsscript.sh
+               fi
                ;;
 
        clean)

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 27a1009e1fa22cc974e98345b1ef5bc9c036261b..6b44117880979b0c059401ae28701356c69fc232 100644 (file)
--- 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.9 2004/06/10 15:51:07 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.10 2004/06/11 19:06:37 zhen Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -32,7 +32,7 @@ class livecd_stage2_target(generic_stage_target):
                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",\
-                       "livecd/rcadd","livecd/rcdel"])
+                       "livecd/rcadd","livecd/rcdel","livecd/fsscript"])
                
                generic_stage_target.__init__(self,spec,addlargs)
                file_locate(self.settings, ["livecd/cdtar","livecd/archscript","livecd/runscript"])