diff -Nru pykickstart-1.82/ChangeLog pykickstart-1.83/ChangeLog --- pykickstart-1.82/ChangeLog 2011-02-18 18:52:40.000000000 +0000 +++ pykickstart-1.83/ChangeLog 2011-03-25 17:27:59.000000000 +0000 @@ -1,9 +1,59 @@ -commit bded4a4a865e7d621a6a990841d4ea6c867a4316 +commit fdcfd68030360bda94dab980eaa181ecc35ec47b +Author: Chris Lumens +Date: Fri Mar 25 13:21:12 2011 -0400 + + New version. + +commit 13dbfdab046e1220a3745c9bbd5ed67cda379690 +Author: Chris Lumens +Date: Fri Mar 25 13:25:40 2011 -0400 + + activate and nodefroute are properties on the Data objects. + +commit 31139f1d0b760c84dd1afa44ed9cb954f5f01b83 +Author: Radek Vykydal +Date: Mon Jan 31 22:16:04 2011 +0100 + + Add kickstart network --nodefroute option (#668417) + + Sets DEFROUTE=no in ifcfg file. + +commit 8d44cb8a393e4823e6bf8a8928c9a3603c40fd55 +Author: Radek Vykydal +Date: Mon Jan 31 22:06:47 2011 +0100 + + Add support for network --bootproto ibft option (#668417) + +commit 5e75f9202aaba82163475706b14ec401cfc251c6 +Author: Radek Vykydal +Date: Wed Dec 1 13:52:27 2010 +0100 + + Add network --activate option (#668417) + + So that we can activate more than one network device in installer + environment using kickstart. + The activating happens in loader (stage 2 is too late for iscsi). + +commit bc7ea960acb90d752130ae3bc0e75ecc8ebeb097 +Author: Chris Lumens +Date: Tue Mar 1 11:09:26 2011 -0500 + + Add support for F16. + +commit 7a81babff00309d17b159f1e1be9dc2f8888b597 Author: Chris Lumens Date: Fri Feb 18 13:51:45 2011 -0500 New version. +commit ef92ba48006c74e4b8371be7ed8f9264009af814 +Author: kristho +Date: Wed Feb 16 00:20:49 2011 +0000 + + l10n: Updates to Danish (da) translation + + Transmitted-via: Transifex (translate.fedoraproject.org) + commit 0e4fa00828764073da6ba624c37e1fb076745a06 Author: Chris Lumens Date: Tue Feb 15 10:23:14 2011 -0500 diff -Nru pykickstart-1.82/debian/changelog pykickstart-1.83/debian/changelog --- pykickstart-1.82/debian/changelog 2011-02-21 10:38:06.000000000 +0000 +++ pykickstart-1.83/debian/changelog 2011-05-02 07:16:00.000000000 +0000 @@ -1,3 +1,11 @@ +pykickstart (1.83-1) unstable; urgency=low + + * New upstream release. + * Update debian/control: bump Standards-Version to 3.9.2 (no changes + needed). + + -- Fathi Boudra Mon, 02 May 2011 10:15:27 +0300 + pykickstart (1.82-1) unstable; urgency=low * New upstream release. diff -Nru pykickstart-1.82/debian/control pykickstart-1.83/debian/control --- pykickstart-1.82/debian/control 2011-02-21 10:37:47.000000000 +0000 +++ pykickstart-1.83/debian/control 2011-05-02 07:16:29.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Carl Chenet , Fathi Boudra Build-Depends: debhelper (>= 7.0.50~), gettext, python (>= 2.3.5-7), python-setuptools, python-support (>= 0.90.0), python-urlgrabber -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://fedoraproject.org/wiki/Pykickstart Vcs-Svn: svn://svn.debian.org/python-modules/packages/pykickstart/trunk Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pykickstart/trunk/ diff -Nru pykickstart-1.82/po/da.po pykickstart-1.83/po/da.po --- pykickstart-1.82/po/da.po 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/po/da.po 2011-03-25 17:27:00.000000000 +0000 @@ -3,14 +3,14 @@ # Christian Rose , 2006. # Keld Simonsen , 2006. # Keld Simonsen , 2007. -# Kris Thomsen , 2009. +# Kris Thomsen , 2009-2011. # msgid "" msgstr "" "Project-Id-Version: pykickstart\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-16 17:03-0400\n" -"PO-Revision-Date: 2009-03-23 09:45+0100\n" +"PO-Revision-Date: 2011-02-11 18:12+0100\n" "Last-Translator: Kris Thomsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -58,27 +58,27 @@ msgstr "Indstillingen %s er krævet" #: ../pykickstart/options.py:87 -#, fuzzy, python-format +#, python-format msgid "" "The %(option)s option was introduced in version %(intro)s, but you are using " "kickstart syntax version %(version)s." msgstr "" "Indstillingen %(option)s blev introduceret i version %(intro)s, men du " -"bruger kickstart-syntax version %(version)s" +"bruger kickstart-syntax version %(version)s." #: ../pykickstart/options.py:93 #, python-format msgid "The %(option)s option is no longer supported." -msgstr "" +msgstr "Indstillingen %(option)s er ikke længere understøttet." #: ../pykickstart/options.py:95 -#, fuzzy, python-format +#, python-format msgid "" "The %(option)s option was removed in version %(removed)s, but you are using " "kickstart syntax version %(version)s." msgstr "" "Indstillingen %(option)s blev fjernet i version %(removed)s, men du bruger " -"kickstart-syntaks version %(version)s" +"kickstart-syntaks version %(version)s." #: ../pykickstart/options.py:98 #, python-format @@ -114,9 +114,9 @@ msgstr "Ugyldig url til %%ksappend: %s" #: ../pykickstart/parser.py:99 -#, fuzzy, python-format +#, python-format msgid "Unable to open %%ksappend file: %s" -msgstr "Kunne ikke åbne %%ksappend fil: " +msgstr "Kunne ikke åbne %%ksappend fil: %s" #: ../pykickstart/parser.py:105 ../pykickstart/parser.py:107 #, python-format @@ -124,9 +124,9 @@ msgstr "Kunne ikke åbne %%ksappend fil" #: ../pykickstart/parser.py:140 ../pykickstart/parser.py:790 -#, fuzzy, python-format +#, python-format msgid "Unable to open input kickstart file: %s" -msgstr "Kunne ikke åbne %%ksappend fil: " +msgstr "Kunne ikke åbne %%ksappend fil: %s" #: ../pykickstart/parser.py:345 msgid "Group cannot specify both --nodefaults and --optional" @@ -135,7 +135,7 @@ #: ../pykickstart/parser.py:673 ../pykickstart/parser.py:733 #, python-format msgid "Section does not end with %%end." -msgstr "" +msgstr "Sektionen slutter ikke med %%end." #. If nothing else worked, we're out of options. #: ../pykickstart/version.py:103 ../pykickstart/version.py:112 @@ -156,7 +156,7 @@ #: ../tools/ksvalidator:56 msgid "list the available versions of kickstart syntax" -msgstr "" +msgstr "oplist de tilgængelige versioner af kickstart-syntax" #: ../tools/ksvalidator:58 msgid "version of kickstart syntax to validate against" @@ -168,6 +168,8 @@ "Error reading %s:\n" "%s" msgstr "" +"Fejl under læsning af %s:\n" +"%s" #: ../tools/ksvalidator:82 ../tools/ksverdiff:61 #, python-format @@ -194,37 +196,37 @@ #: ../tools/ksverdiff:54 msgid "You must specify two syntax versions." -msgstr "" +msgstr "Du sḱal angive to syntaxversioner." #: ../tools/ksverdiff:68 #, python-format msgid "The following commands were removed in %s:" -msgstr "" +msgstr "Følgende kommandoer blev fjernet i %s:" #: ../tools/ksverdiff:71 #, python-format msgid "The following commands were deprecated in %s:" -msgstr "" +msgstr "Følgende kommandoer blev forældret i %s:" #: ../tools/ksverdiff:74 #, python-format msgid "The following commands were added in %s:" -msgstr "" +msgstr "Følgende kommandoer blev tilføjet i %s:" #: ../tools/ksverdiff:100 #, python-format msgid "The following options were added to the %s command in %s:" -msgstr "" +msgstr "Følgende indstillinger blev tilføjet til kommandoen %s i %s:" #: ../tools/ksverdiff:105 #, python-format msgid "The following options were deprecated from the %s command in %s:" -msgstr "" +msgstr "Følgende indstillinger blev forældet fra kommandoen %s i %s:" #: ../tools/ksverdiff:110 #, python-format msgid "The following options were removed from the %s command in %s:" -msgstr "" +msgstr "Følgende indstillinger blev fjernet fra kommandoen %s i %s:" #~ msgid "" #~ "%s does not end with %%end. This syntax has been deprecated. It may be " diff -Nru pykickstart-1.82/pykickstart/commands/network.py pykickstart-1.83/pykickstart/commands/network.py --- pykickstart-1.82/pykickstart/commands/network.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/pykickstart/commands/network.py 2011-03-25 17:27:00.000000000 +0000 @@ -140,6 +140,25 @@ return retval +class F16_NetworkData(F8_NetworkData): + removedKeywords = F8_NetworkData.removedKeywords + removedAttrs = F8_NetworkData.removedAttrs + + def __init__(self, *args, **kwargs): + F8_NetworkData.__init__(self, *args, **kwargs) + self.activate = kwargs.get("activate", False) + self.nodefroute = kwargs.get("nodefroute", False) + + def _getArgsAsStr(self): + retval = F8_NetworkData._getArgsAsStr(self) + + if self.activate: + retval += " --activate" + if self.nodefroute: + retval += " --nodefroute" + + return retval + class RHEL4_NetworkData(FC3_NetworkData): removedKeywords = FC3_NetworkData.removedKeywords removedAttrs = FC3_NetworkData.removedAttrs @@ -156,6 +175,25 @@ return retval +class RHEL6_NetworkData(F8_NetworkData): + removedKeywords = F8_NetworkData.removedKeywords + removedAttrs = F8_NetworkData.removedAttrs + + def __init__(self, *args, **kwargs): + F8_NetworkData.__init__(self, *args, **kwargs) + self.activate = kwargs.get("activate", False) + self.nodefroute = kwargs.get("nodefroute", False) + + def _getArgsAsStr(self): + retval = F8_NetworkData._getArgsAsStr(self) + + if self.activate: + retval += " --activate" + if self.nodefroute: + retval += " --nodefroute" + + return retval + class FC3_Network(KickstartCommand): removedKeywords = KickstartCommand.removedKeywords removedAttrs = KickstartCommand.removedAttrs @@ -263,6 +301,22 @@ choices=self.bootprotoList) return op +class F16_Network(F9_Network): + removedKeywords = F9_Network.removedKeywords + removedAttrs = F9_Network.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + F9_Network.__init__(self, writePriority, *args, **kwargs) + self.bootprotoList.append(BOOTPROTO_IBFT) + + def _getParser(self): + op = F9_Network._getParser(self) + op.add_option("--activate", dest="activate", action="store_true", + default=False) + op.add_option("--nodefroute", dest="nodefroute", action="store_true", + default=False) + return op + class RHEL4_Network(FC3_Network): removedKeywords = FC3_Network.removedKeywords removedAttrs = FC3_Network.removedAttrs @@ -287,3 +341,19 @@ default=BOOTPROTO_DHCP, choices=self.bootprotoList) return op + +class RHEL6_Network(F9_Network): + removedKeywords = F9_Network.removedKeywords + removedAttrs = F9_Network.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + F9_Network.__init__(self, writePriority, *args, **kwargs) + self.bootprotoList.append(BOOTPROTO_IBFT) + + def _getParser(self): + op = F9_Network._getParser(self) + op.add_option("--activate", dest="activate", action="store_true", + default=False) + op.add_option("--nodefroute", dest="nodefroute", action="store_true", + default=False) + return op diff -Nru pykickstart-1.82/pykickstart/constants.py pykickstart-1.83/pykickstart/constants.py --- pykickstart-1.82/pykickstart/constants.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/pykickstart/constants.py 2011-03-25 17:27:00.000000000 +0000 @@ -50,6 +50,7 @@ BOOTPROTO_BOOTP = "bootp" BOOTPROTO_STATIC = "static" BOOTPROTO_QUERY = "query" +BOOTPROTO_IBFT = "ibft" GROUP_REQUIRED = 0 GROUP_DEFAULT = 1 diff -Nru pykickstart-1.82/pykickstart/handlers/control.py pykickstart-1.83/pykickstart/handlers/control.py --- pykickstart-1.82/pykickstart/handlers/control.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/pykickstart/handlers/control.py 2011-03-25 17:27:00.000000000 +0000 @@ -763,6 +763,66 @@ "zfcp": zfcp.F14_ZFCP, }, + # based on f15 + F16: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.F12_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.F15_Bootloader, + "cdrom": method.F14_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.F8_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "dmraid": dmraid.FC6_DmRaid, + "driverdisk": driverdisk.F14_DriverDisk, + "fcoe": fcoe.F13_Fcoe, + "firewall": firewall.F14_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "group": group.F12_Group, + "halt": reboot.FC6_Reboot, + "harddrive": method.F14_Method, + "ignoredisk": ignoredisk.F14_IgnoreDisk, + "install": upgrade.F11_Upgrade, + "iscsi": iscsi.F10_Iscsi, + "iscsiname": iscsiname.FC6_IscsiName, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "logging": logging.FC6_Logging, + "logvol": logvol.F15_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.F10_Monitor, + "multipath": multipath.FC6_MultiPath, + "network": network.F16_Network, + "nfs": method.F14_Method, + "part": partition.F14_Partition, + "partition": partition.F14_Partition, + "poweroff": reboot.FC6_Reboot, + "raid": raid.F15_Raid, + "reboot": reboot.FC6_Reboot, + "repo": repo.F15_Repo, + "rescue": rescue.F10_Rescue, + "rootpw": rootpw.F8_RootPw, + "selinux": selinux.FC3_SELinux, + "services": services.FC6_Services, + "shutdown": reboot.FC6_Reboot, + "skipx": skipx.FC3_SkipX, + "sshpw": sshpw.F13_SshPw, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC6_Timezone, + "updates": updates.F7_Updates, + "upgrade": upgrade.F11_Upgrade, + "url": method.F14_Method, + "user": user.F12_User, + "vnc": vnc.F9_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.F14_XConfig, + "zerombr": zerombr.F9_ZeroMbr, + "zfcp": zfcp.F14_ZFCP, + }, + # based on fc1 RHEL3: { "auth": authconfig.FC3_Authconfig, @@ -955,7 +1015,7 @@ "mediacheck": mediacheck.FC4_MediaCheck, "monitor": monitor.F10_Monitor, "multipath": multipath.FC6_MultiPath, - "network": network.F9_Network, + "network": network.RHEL6_Network, "nfs": method.RHEL6_Method, "part": partition.F12_Partition, "partition": partition.F12_Partition, @@ -1176,6 +1236,24 @@ "VolGroupData": volgroup.FC3_VolGroupData, "ZFCPData": zfcp.F14_ZFCPData, }, + F16: { + "DriverDiskData": driverdisk.F14_DriverDiskData, + "DeviceData": device.F8_DeviceData, + "DmRaidData": dmraid.FC6_DmRaidData, + "FcoeData": fcoe.F13_FcoeData, + "GroupData": group.F12_GroupData, + "IscsiData": iscsi.F10_IscsiData, + "LogVolData": logvol.F15_LogVolData, + "MultiPathData": multipath.FC6_MultiPathData, + "NetworkData": network.F16_NetworkData, + "PartData": partition.F14_PartData, + "RaidData": raid.F15_RaidData, + "RepoData": repo.F15_RepoData, + "SshPwData": sshpw.F13_SshPwData, + "UserData": user.F12_UserData, + "VolGroupData": volgroup.FC3_VolGroupData, + "ZFCPData": zfcp.F14_ZFCPData, + }, RHEL3: { "DriverDiskData": driverdisk.FC3_DriverDiskData, "LogVolData": logvol.FC3_LogVolData, @@ -1217,7 +1295,7 @@ "IscsiData": iscsi.F10_IscsiData, "LogVolData": logvol.F12_LogVolData, "MultiPathData": multipath.FC6_MultiPathData, - "NetworkData": network.F8_NetworkData, + "NetworkData": network.RHEL6_NetworkData, "PartData": partition.F12_PartData, "RaidData": raid.F13_RaidData, "RepoData": repo.RHEL6_RepoData, diff -Nru pykickstart-1.82/pykickstart/handlers/f16.py pykickstart-1.83/pykickstart/handlers/f16.py --- pykickstart-1.82/pykickstart/handlers/f16.py 1970-01-01 00:00:00.000000000 +0000 +++ pykickstart-1.83/pykickstart/handlers/f16.py 2011-03-25 17:27:00.000000000 +0000 @@ -0,0 +1,24 @@ +# +# Chris Lumens +# +# Copyright 2011 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +from pykickstart.base import * +from pykickstart.version import * + +class F16Handler(BaseHandler): + version = F16 diff -Nru pykickstart-1.82/pykickstart/version.py pykickstart-1.83/pykickstart/version.py --- pykickstart-1.82/pykickstart/version.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/pykickstart/version.py 2011-03-25 17:27:00.000000000 +0000 @@ -69,16 +69,17 @@ RHEL6 = 11100 F14 = 12000 F15 = 13000 +F16 = 14000 # This always points at the latest version and is the default. -DEVEL = F15 +DEVEL = F16 # A one-to-one mapping from string representations to version numbers. versionMap = { "DEVEL": DEVEL, "FC3": FC3, "FC4": FC4, "FC5": FC5, "FC6": FC6, "F7": F7, "F8": F8, "F9": F9, "F10": F10, "F11": F11, "F12": F12, "F13": F13, - "F14": F14, "F15": F15, + "F14": F14, "F15": F15, "F16": F16, "RHEL3": RHEL3, "RHEL4": RHEL4, "RHEL5": RHEL5, "RHEL6": RHEL6 } diff -Nru pykickstart-1.82/pykickstart.spec pykickstart-1.83/pykickstart.spec --- pykickstart-1.82/pykickstart.spec 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/pykickstart.spec 2011-03-25 17:27:00.000000000 +0000 @@ -3,7 +3,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart Url: http://fedoraproject.org/wiki/pykickstart -Version: 1.82 +Version: 1.83 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -45,6 +45,12 @@ %{_bindir}/ksverdiff %changelog +* Fri Mar 25 2011 Chris Lumens - 1.83-1 +- Add kickstart network --nodefroute option (#668417) (rvykydal) +- Add support for network --bootproto ibft option (#668417) (rvykydal) +- Add network --activate option (#668417) (rvykydal) +- Add support for F16. (clumens) + * Fri Feb 18 2011 Chris Lumens - 1.82-1 - Add support for "logvol --label=" (#677571). (clumens) diff -Nru pykickstart-1.82/setup.py pykickstart-1.83/setup.py --- pykickstart-1.82/setup.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/setup.py 2011-03-25 17:27:00.000000000 +0000 @@ -2,7 +2,7 @@ from distutils.core import setup -setup(name='pykickstart', version='1.82', +setup(name='pykickstart', version='1.83', description='Python module for manipulating kickstart files', author='Chris Lumens', author_email='clumens@redhat.com', url='http://fedoraproject.org/wiki/pykickstart', diff -Nru pykickstart-1.82/tests/version.py pykickstart-1.83/tests/version.py --- pykickstart-1.82/tests/version.py 2011-02-18 18:51:45.000000000 +0000 +++ pykickstart-1.83/tests/version.py 2011-03-25 17:27:00.000000000 +0000 @@ -78,6 +78,9 @@ # pass - F15 self.assertEqual(stringToVersion("Fedora 15"), F15) self.assertEqual(stringToVersion("F15"), F15) + # pass - F16 + self.assertEqual(stringToVersion("Fedora 16"), F16) + self.assertEqual(stringToVersion("F16"), F16) # pass - RHEL3 self.assertEqual(stringToVersion("Red Hat Enterprise Linux 3"), RHEL3) @@ -146,7 +149,8 @@ self.assertEqual(versionToString(F13, skipDevel=True), "F13") self.assertEqual(versionToString(F14, skipDevel=True), "F14") self.assertEqual(versionToString(F15, skipDevel=True), "F15") - self.assertEqual(versionToString(F15, skipDevel=False), "DEVEL") + self.assertEqual(versionToString(F16, skipDevel=True), "F16") + self.assertEqual(versionToString(F16, skipDevel=False), "DEVEL") # RHEL series self.assertEqual(versionToString(RHEL3), "RHEL3") self.assertEqual(versionToString(RHEL4), "RHEL4")