From 33c487b72ff0a651fc1658b6f5eebc6a010bb36d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 18 Jan 2006 13:06:40 +0000 Subject: [PATCH] Added livecd/volid to valid_values. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1029 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/livecd_stage2_target.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d425db2d..9993da53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.514 2006/01/17 22:45:51 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.515 2006/01/18 13:06:39 wolf31o2 Exp $ + + 18 Jan 2006; Chris Gianelloni + modules/livecd_stage2_target.py: + Added livecd/volid to valid_values. 17 Jan 2006; Eric Edgar modules/generic_stage_target.py: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index bdb5632e..a70f6503 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_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/livecd_stage2_target.py,v 1.59 2006/01/17 20:39:15 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.60 2006/01/18 13:06:40 wolf31o2 Exp $ """ Builder class for a LiveCD stage2 build. @@ -25,7 +25,7 @@ class livecd_stage2_target(generic_stage_target): "livecd/root_overlay","livecd/devmanager","livecd/users",\ "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\ "livecd/fstype","livecd/linuxrc","livecd/bootargs","gamecd/conf",\ - "livecd/xdm","livecd/xsession"]) + "livecd/xdm","livecd/xsession","livecd/volid"]) generic_stage_target.__init__(self,spec,addlargs) if not self.settings.has_key("livecd/type"): -- 2.26.2