Fix rc-update to automatically run default options for livecds. Removed an erroneous...

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 c4220b7174db26f4faecda24278568488fdbeef9..67bd51e283a93ad70cfce8979c3cf701cbe184df 100644 (file)
--- 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 <rocket@gentoo.org>
+  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 <rocket@gentoo.org> 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 <rocket@gentoo.org>
   +examples/stage4_template.spec:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 954ae69ee79bb97f94513fe35152c7b7bbfe8c0b..0e68c7fa251a5dd543dd090e26d31369f49da01c 100644 (file)
--- 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") \