From: Eric Edgar Date: Mon, 7 Nov 2005 15:46:05 +0000 (+0000) Subject: Fix rc-update to automatically run default options for livecds. Removed an erroneous... X-Git-Tag: CATALYST_2_0_6_916~621 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fad98f05660caf044946c0e8be41cefd6bff09e6;p=catalyst.git Fix rc-update to automatically run default options for livecds. Removed an erroneous key check. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@873 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c4220b71..67bd51e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.363 2005/11/02 21:49:15 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.364 2005/11/07 15:46:05 rocket Exp $ + + 07 Nov 2005; Eric Edgar + modules/generic_stage_target.py: + Fix rc-update to automatically run default options for livecds. Removed an + erroneous key check. + + 02 Nov 2005; Eric Edgar modules/embedded_target.py, + modules/livecd_stage1_target.py, modules/tinderbox_target.py: + Make use spec key optional to default to profile defaults 02 Nov 2005; Eric Edgar +examples/stage4_template.spec: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 954ae69e..0e68c7fa 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_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/generic_stage_target.py,v 1.68 2005/10/18 21:12:45 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.69 2005/11/07 15:46:05 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -763,10 +763,9 @@ class generic_stage_target(generic_target): and os.path.exists(self.settings["autoresume_path"]+"rcupdate"): print "Resume point detected, skipping rcupdate operation..." else: - if self.settings.has_key("rcadd") or self.settings.has_key("rcdel"): - if os.path.exists(self.settings["controller_file"]): - cmd("/bin/bash "+self.settings["controller_file"]+" rc-update","rc-update script failed.") - touch(self.settings["autoresume_path"]+"rcupdate") + if os.path.exists(self.settings["controller_file"]): + cmd("/bin/bash "+self.settings["controller_file"]+" rc-update","rc-update script failed.") + touch(self.settings["autoresume_path"]+"rcupdate") def clean(self): if self.settings.has_key("AUTORESUME") \