fix for linuxrc variable not being available
authorEric Edgar <rocket@gentoo.org>
Tue, 10 Jan 2006 19:52:46 +0000 (19:52 +0000)
committerEric Edgar <rocket@gentoo.org>
Tue, 10 Jan 2006 19:52:46 +0000 (19:52 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1016 d1e1f19c-881f-0410-ab34-b69fee027534

modules/generic_stage_target.py

index 873d71d88f3980f220bf94a7566723e08606bccb..cfde139a89103b254c2a1ceb51b8f4af2f7dbc1e 100644 (file)
@@ -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.113 2006/01/10 15:42:01 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.114 2006/01/10 19:52:46 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -149,6 +149,7 @@ class generic_stage_target(generic_target):
                self.set_iso()
                self.set_packages()
                self.set_rm()
+               self.set_linuxrc()
                self.set_portage_overlay()      
                # this next line checks to make sure that the specified variables exist on disk.
                #pdb.set_trace()
@@ -430,6 +431,12 @@ class generic_stage_target(generic_target):
                if type(self.settings[self.settings["spec_prefix"]+"/rm"])==types.StringType:
                    self.settings[self.settings["spec_prefix"]+"/rm"]=self.settings[self.settings["spec_prefix"]+"/rm"].split()
 
+       def set_linuxrc(self):
+           if self.settings.has_key(self.settings["spec_prefix"]+"/linuxrc"):
+                       if type(self.settings[self.settings["spec_prefix"]+"/linuxrc"])==types.StringType:
+                               self.settings["linuxrc"]=self.settings[self.settings["spec_prefix"]+"/linuxrc"]
+                               del self.settings[self.settings["spec_prefix"]+"/linuxrc"]
+
        def set_portage_overlay(self):
            if self.settings.has_key("portage_overlay"):
                if type(self.settings["portage_overlay"])==types.StringType: