From: Eric Edgar Date: Fri, 17 Feb 2006 13:34:42 +0000 (+0000) Subject: add stage4/unmerge stage4/rm to valid options X-Git-Tag: CATALYST_2_0_6_916~401 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fa29b843ce58a0d4025ba81a665e6d1356bfad8;p=catalyst.git add stage4/unmerge stage4/rm to valid options git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1093 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 9396b118..f0ef74a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.578 2006/02/15 16:59:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.579 2006/02/17 13:34:41 rocket Exp $ + + 17 Feb 2006; Eric Edgar modules/stage4_target.py: + add stage4/unmerge stage4/rm to valid options 15 Feb 2006; Chris Gianelloni targets/support/rc-update.sh: diff --git a/modules/stage4_target.py b/modules/stage4_target.py index f1b61e29..3208f97e 100644 --- a/modules/stage4_target.py +++ b/modules/stage4_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.18 2006/01/20 14:34:57 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.19 2006/02/17 13:34:42 rocket Exp $ """ Builder class for stage4. @@ -14,7 +14,7 @@ class stage4_target(generic_stage_target): self.required_values=[] self.valid_values=self.required_values[:] self.valid_values.extend(["stage4/use","stage4/packages","stage4/root_overlay", "stage4/fsscript", \ - "stage4/rcadd","stage4/rcdel","stage4/linuxrc","boot/kernel"]) + "stage4/rcadd","stage4/rcdel","stage4/linuxrc","stage4/unmerge","stage4/rm","boot/kernel"]) generic_stage_target.__init__(self,spec,addlargs) def set_cleanables(self):