Fix to for the correct -o option

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

diff --git a/ChangeLog b/ChangeLog
index c989921e8297d568d86851c5d3bbd559baa33b3c..763cdb1728faf99fcea795bf460b34f0c97f464c 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.367 2005/11/07 16:36:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.368 2005/11/07 18:58:06 rocket Exp $
+
+  07 Nov 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py, targets/support/create-iso.sh:
+  Fix  to  for the correct -o option
 
   07 Nov 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 396549b91209fa7cdd66cc387af92365fd6a66e7..1fdb7c43e6324e57b4680b184932002ada60c344 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.71 2005/11/07 16:36:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.72 2005/11/07 18:58:06 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -412,6 +412,20 @@ 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")

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index f69e10737b0ebe19739c188d2fc056df04944110..0989e29dd0ea5300a93e1dce38b2d915c2fc9279 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -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/targets/support/create-iso.sh,v 1.12 2005/10/13 19:01:21 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.13 2005/11/07 18:58:06 rocket Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -87,21 +87,21 @@ case ${clst_mainarch} in
        hppa)
                case ${clst_livecd_cdfstype} in
                        zisofs)
-                               mkisofs -J -R -l -z -V "${iso_volume_id}" -o ${2} ${clst_cdroot_path}  || die "Cannot make ISO image"
+                               mkisofs -J -R -l -z -V "${iso_volume_id}" -o ${1} ${clst_cdroot_path}  || die "Cannot make ISO image"
                        ;;
                        *)
-                               mkisofs -J -R -l -V "${iso_volume_id}" -o ${2} ${clst_cdroot_path}  || die "Cannot make ISO image"
+                               mkisofs -J -R -l -V "${iso_volume_id}" -o ${1} ${clst_cdroot_path}  || die "Cannot make ISO image"
                        ;;
                esac
-               palo -f boot/palo.conf -C ${2}
+               palo -f boot/palo.conf -C ${1}
        ;;
        ppc*)
                case ${clst_livecd_cdfstype} in
                        zisofs)
-                               mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map ${clst_cdroot_path}/boot/map.hfs -part -no-desktop -hfs-volid "${iso_volume_id}" -hfs-bless ${clst_cdroot_path}/boot -V "${iso_volume_id}" -o ${2} ${clst_cdroot_path} || die "Cannot make ISO image"
+                               mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map ${clst_cdroot_path}/boot/map.hfs -part -no-desktop -hfs-volid "${iso_volume_id}" -hfs-bless ${clst_cdroot_path}/boot -V "${iso_volume_id}" -o ${1} ${clst_cdroot_path} || die "Cannot make ISO image"
                        ;;
                        *)
-                               mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map ${clst_cdroot_path}/boot/map.hfs -part -no-desktop -hfs-volid "${iso_volume_id}" -hfs-bless ${clst_cdroot_path}/boot -V "${iso_volume_id}" -o ${2} ${clst_cdroot_path} || die "Cannot make ISO image"
+                               mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map ${clst_cdroot_path}/boot/map.hfs -part -no-desktop -hfs-volid "${iso_volume_id}" -hfs-bless ${clst_cdroot_path}/boot -V "${iso_volume_id}" -o ${1} ${clst_cdroot_path} || die "Cannot make ISO image"
                        ;;
                esac
        ;;
@@ -113,11 +113,11 @@ case ${clst_mainarch} in
                mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp 
                case ${clst_livecd_cdfstype} in
                    zisofs)
-                       /tmp/mkisofs.sparc.fu -z -o ${2} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'\
+                       /tmp/mkisofs.sparc.fu -z -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'\
                        -V "${iso_volume_id}" ${clst_cdroot_path}  || die "Cannot make ISO image"
                    ;;
                    *)
-                       /tmp/mkisofs.sparc.fu -o ${2} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'\
+                       /tmp/mkisofs.sparc.fu -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf'\
                        -V "${iso_volume_id}" ${clst_cdroot_path}  || die "Cannot make ISO image"
                    ;;
                esac