Netboot2 fixes for spec parameter checks

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1036 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 8a159226977ad826227a51a2e3099c0ba7d4cc93..deea8e20775528379270166f6c19a448b29241da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.521 2006/01/20 14:34:57 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.522 2006/01/20 17:19:42 rocket Exp $
+
+  20 Jan 2006; Eric Edgar <rocket@gentoo.org> modules/netboot2_target.py:
+  Netboot2 fixes for spec parameter checks
 
   20 Jan 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, modules/stage4_target.py:
-  add makeopts spec file support.  Fix printout typo bug 119635.
+  add makeopts spec file support.
 
   20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py
index 761764ac5b8503362a6e33a8ef549252db1c6a48..383af2772605a5cda2a5b418ffafea0d9284929f 100644 (file)
--- a/modules/netboot2_target.py
+++ b/modules/netboot2_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/netboot2_target.py,v 1.1 2006/01/13 15:09:07 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/netboot2_target.py,v 1.2 2006/01/20 17:19:42 rocket Exp $
 
 """
 Builder class for a netboot build, version 2
@@ -12,15 +12,16 @@ from generic_stage_target import *
 
 class netboot2_target(generic_stage_target):
        def __init__(self,spec,addlargs):
-               self.valid_values = [
-                       "netboot2/extra_files",
-               ]
                self.required_values=[
                        "boot/kernel",
                        "netboot2/builddate",
                        "netboot2/busybox_config",
-                       "netboot2/packages"                     
+                       "netboot2/packages",                    
+                       "netboot2/use"                  
                ]
+               self.valid_values=self.required_values[:]
+               self.valid_values.extend(self.required_values)
+               self.valid_values.extend(["netboot2/extra_files"])
                        
                try:
                        if addlargs.has_key("netboot2/packages"):
@@ -28,13 +29,16 @@ class netboot2_target(generic_stage_target):
                                        loopy=[addlargs["netboot2/packages"]]
                                else:
                                        loopy=addlargs["netboot2/packages"]
+
+                               for x in loopy:
+                                       self.valid_values.append("netboot2/packages/"+x+"/files")
                except:
                        raise CatalystError,"configuration error in netboot2/packages."
                
                
 
                generic_stage_target.__init__(self,spec,addlargs)
-               self.set_build_kernel_vars(addlargs)
+               self.set_build_kernel_vars()
 
                # Merge packages into the buildroot, and pick out certain files to place in
                # /tmp/image