Fix broken aliases code that was just proof of concept

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

diff --git a/ChangeLog b/ChangeLog
index c8b85fd20945f748c22a371e4443f9420a14c7bd..04288d3886dff1871d6c189c59e2152f738c73bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.369 2005/11/07 19:34:20 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.370 2005/11/07 19:46:04 rocket Exp $
+
+  07 Nov 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  Fix broken aliases code that was just proof of concept
 
   07 Nov 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh:
   Output mkisofs command line options to assist in debugging

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 1fdb7c43e6324e57b4680b184932002ada60c344..74b52216e71fe717f0fb9dffa11972d42072655a 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.72 2005/11/07 18:58:06 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.73 2005/11/07 19:46:04 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -412,20 +412,6 @@ class generic_stage_target(generic_target):
                        self.required_values.append("boot/kernel/"+x+"/sources")
                        self.required_values.append("boot/kernel/"+x+"/config")
                        self.valid_values.append("boot/kernel/"+x+"/aliases")
-                           if type(self.settings["boot/kernel/"+x+"/aliases"]) == types.StringType:
-                               aliases=[self.settings["boot/kernel/"+x+"/aliases"]]
-                           else:       
-                               aliases=self.settings["boot/kernel/"+x+"/aliases"]
-                       
-                       self.valid_values.append("boot/kernel/"+x+"/console-types")
-                           if type(self.settings["boot/kernel/"+x+"/console-types"]) == types.StringType:
-                               consoles=[self.settings["boot/kernel/"+x+"/console-types"]]
-
-                           else:       
-                               consoles=self.settings["boot/kernel/"+x+"/console-types"]
-                       #19:49 <dostrow_work> boot/kernel/pseries/console-types: none serial hvc hvsi
-                       #19:49 <dostrow_work> boot/kernel/pseries/console/serial: ttyS0,9600
-
                        self.valid_values.append("boot/kernel/"+x+"/extraversion")
                        self.valid_values.append("boot/kernel/"+x+"/packages")
                        self.valid_values.append("boot/kernel/"+x+"/use")