From 8477484ef43a66f164f9320714cdc93d8098063a Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Mon, 19 Feb 2007 18:54:57 +0000 Subject: [PATCH] Rename command objects by inserting an underscore between the version part and the name part. --- ChangeLog | 8 + pykickstart/base.py | 10 +- pykickstart/commands/authconfig.py | 2 +- pykickstart/commands/autopart.py | 2 +- pykickstart/commands/autostep.py | 2 +- pykickstart/commands/bootloader.py | 4 +- pykickstart/commands/clearpart.py | 2 +- pykickstart/commands/device.py | 2 +- pykickstart/commands/deviceprobe.py | 2 +- pykickstart/commands/displaymode.py | 2 +- pykickstart/commands/dmraid.py | 6 +- pykickstart/commands/driverdisk.py | 2 +- pykickstart/commands/firewall.py | 2 +- pykickstart/commands/firstboot.py | 2 +- pykickstart/commands/ignoredisk.py | 2 +- pykickstart/commands/interactive.py | 2 +- pykickstart/commands/iscsi.py | 6 +- pykickstart/commands/iscsiname.py | 2 +- pykickstart/commands/key.py | 4 +- pykickstart/commands/keyboard.py | 2 +- pykickstart/commands/lang.py | 2 +- pykickstart/commands/langsupport.py | 4 +- pykickstart/commands/lilocheck.py | 2 +- pykickstart/commands/logging.py | 2 +- pykickstart/commands/logvol.py | 18 +- pykickstart/commands/mediacheck.py | 2 +- pykickstart/commands/method.py | 6 +- pykickstart/commands/monitor.py | 6 +- pykickstart/commands/mouse.py | 2 +- pykickstart/commands/multipath.py | 10 +- pykickstart/commands/network.py | 40 +- pykickstart/commands/partition.py | 18 +- pykickstart/commands/raid.py | 28 +- pykickstart/commands/reboot.py | 6 +- pykickstart/commands/repo.py | 6 +- pykickstart/commands/rootpw.py | 2 +- pykickstart/commands/selinux.py | 2 +- pykickstart/commands/services.py | 2 +- pykickstart/commands/skipx.py | 2 +- pykickstart/commands/timezone.py | 2 +- pykickstart/commands/upgrade.py | 2 +- pykickstart/commands/user.py | 6 +- pykickstart/commands/vnc.py | 6 +- pykickstart/commands/volgroup.py | 6 +- pykickstart/commands/xconfig.py | 6 +- pykickstart/commands/zerombr.py | 2 +- pykickstart/commands/zfcp.py | 6 +- pykickstart/handlers/control.py | 782 ++++++++++++++++++------------------ 48 files changed, 529 insertions(+), 515 deletions(-) rewrite pykickstart/handlers/control.py (95%) diff --git a/ChangeLog b/ChangeLog index a158603..640a2f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-02-19 Chris Lumens + * pykickstart/commands/*.py: All command objects now have an + underscore between the version part and the name for ease of + processing. + * pykickstart/handlers/control.py (commandMap): Likewise. + + * pykickstart/base.py (BaseHandler._setCommand): Strip version part + from name before creating the attribute. + * pykickstart/version.py (versionToString): Added a method to convert version numbers back into strings, which is needed for the above change. diff --git a/pykickstart/base.py b/pykickstart/base.py index 7781b0a..312ed92 100644 --- a/pykickstart/base.py +++ b/pykickstart/base.py @@ -232,8 +232,14 @@ class BaseHandler: def _setCommand(self, cmdObj): # Add an attribute on this version object. We need this to provide a - # way for clients to access the command objects. - setattr(self, cmdObj.__class__.__name__.lower(), cmdObj) + # way for clients to access the command objects. We also need to strip + # off the version part from the front of the name. + if cmdObj.__class__.__name__.find("_") != -1: + name = cmdObj.__class__.__name__.split("_", 1)[1] + else: + name = cmdObj.__class__.__name__.lower() + + setattr(self, name.lower(), cmdObj) # Also, add the object into the _writeOrder dict in the right place. if cmdObj.writePriority is not None: diff --git a/pykickstart/commands/authconfig.py b/pykickstart/commands/authconfig.py index 09ce864..7709173 100644 --- a/pykickstart/commands/authconfig.py +++ b/pykickstart/commands/authconfig.py @@ -14,7 +14,7 @@ import string from pykickstart.base import * -class FC3Authconfig(KickstartCommand): +class FC3_Authconfig(KickstartCommand): def __init__(self, writePriority=0, authconfig=""): KickstartCommand.__init__(self, writePriority) self.authconfig = authconfig diff --git a/pykickstart/commands/autopart.py b/pykickstart/commands/autopart.py index e652ebe..6f987b3 100644 --- a/pykickstart/commands/autopart.py +++ b/pykickstart/commands/autopart.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3AutoPart(KickstartCommand): +class FC3_AutoPart(KickstartCommand): def __init__(self, writePriority=100, autopart=False): KickstartCommand.__init__(self, writePriority) self.autopart = autopart diff --git a/pykickstart/commands/autostep.py b/pykickstart/commands/autostep.py index 8de9ef7..e7b1726 100644 --- a/pykickstart/commands/autostep.py +++ b/pykickstart/commands/autostep.py @@ -13,7 +13,7 @@ from pykickstart.base import * from pykickstart.options import * -class FC3AutoStep(KickstartCommand): +class FC3_AutoStep(KickstartCommand): def __init__(self, writePriority=0, autoscreenshot=False): KickstartCommand.__init__(self, writePriority) self.autoscreenshot = autoscreenshot diff --git a/pykickstart/commands/bootloader.py b/pykickstart/commands/bootloader.py index b924e42..c01a9de 100644 --- a/pykickstart/commands/bootloader.py +++ b/pykickstart/commands/bootloader.py @@ -15,7 +15,7 @@ import string from pykickstart.base import * from pykickstart.options import * -class FC3Bootloader(KickstartCommand): +class FC3_Bootloader(KickstartCommand): def __init__(self, writePriority=0, appendLine="", driveorder=None, forceLBA=False, linear=True, location="mbr", md5pass="", password="", upgrade=False, useLilo=False): @@ -89,7 +89,7 @@ class FC3Bootloader(KickstartCommand): if self.currentCmd == "lilo": self.useLilo = True -class FC4Bootloader(FC3Bootloader): +class FC4_Bootloader(FC3_Bootloader): def __init__(self, writePriority=0, appendLine="", driveorder=None, forceLBA=False, location="mbr", md5pass="", password="", upgrade=False): diff --git a/pykickstart/commands/clearpart.py b/pykickstart/commands/clearpart.py index 5c4872a..6ed690b 100644 --- a/pykickstart/commands/clearpart.py +++ b/pykickstart/commands/clearpart.py @@ -17,7 +17,7 @@ from pykickstart.constants import * from pykickstart.errors import * from pykickstart.options import * -class FC3ClearPart(KickstartCommand): +class FC3_ClearPart(KickstartCommand): def __init__(self, writePriority=120, drives=None, initAll=False, type=CLEARPART_TYPE_NONE): KickstartCommand.__init__(self, writePriority) diff --git a/pykickstart/commands/device.py b/pykickstart/commands/device.py index 833cafe..13e7737 100644 --- a/pykickstart/commands/device.py +++ b/pykickstart/commands/device.py @@ -14,7 +14,7 @@ import string from pykickstart.base import * -class FC3Device(KickstartCommand): +class FC3_Device(KickstartCommand): def __init__(self, writePriority=0, device=""): KickstartCommand.__init__(self, writePriority) self.device = device diff --git a/pykickstart/commands/deviceprobe.py b/pykickstart/commands/deviceprobe.py index bdfcbb5..4b63b03 100644 --- a/pykickstart/commands/deviceprobe.py +++ b/pykickstart/commands/deviceprobe.py @@ -14,7 +14,7 @@ import string from pykickstart.base import * -class FC3DeviceProbe(KickstartCommand): +class FC3_DeviceProbe(KickstartCommand): def __init__(self, writePriority=0, deviceprobe=""): KickstartCommand.__init__(self, writePriority) self.deviceprobe = deviceprobe diff --git a/pykickstart/commands/displaymode.py b/pykickstart/commands/displaymode.py index 3c5104f..5a50e0b 100644 --- a/pykickstart/commands/displaymode.py +++ b/pykickstart/commands/displaymode.py @@ -14,7 +14,7 @@ from pykickstart.base import * from pykickstart.constants import * from pykickstart.options import * -class FC3DisplayMode(KickstartCommand): +class FC3_DisplayMode(KickstartCommand): def __init__(self, writePriority=0, displayMode=DISPLAY_MODE_GRAPHICAL): KickstartCommand.__init__(self, writePriority) self.displayMode = displayMode diff --git a/pykickstart/commands/dmraid.py b/pykickstart/commands/dmraid.py index b0c7134..fbb527b 100644 --- a/pykickstart/commands/dmraid.py +++ b/pykickstart/commands/dmraid.py @@ -21,7 +21,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6DmRaidData(BaseData): +class FC6_DmRaidData(BaseData): def __init__(self, name="", devices=None, dmset=None): BaseData.__init__(self) self.name = name @@ -40,7 +40,7 @@ class FC6DmRaidData(BaseData): return retval + "\n" -class FC6DmRaid(KickstartCommand): +class FC6_DmRaid(KickstartCommand): def __init__(self, writePriority=60, dmraids=None): KickstartCommand.__init__(self, writePriority) @@ -63,7 +63,7 @@ class FC6DmRaid(KickstartCommand): op.add_option("--dev", dest="devices", action="append", type="string", required=1) - dm = FC6DmRaidData() + dm = FC6_DmRaidData() (opts, extra) = op.parse_args(args=args) dm.name = dm.name.split('/')[-1] self._setToObj(op, opts, dm) diff --git a/pykickstart/commands/driverdisk.py b/pykickstart/commands/driverdisk.py index 5e1fd76..1af7aa2 100644 --- a/pykickstart/commands/driverdisk.py +++ b/pykickstart/commands/driverdisk.py @@ -14,7 +14,7 @@ import string from pykickstart.base import * -class FC3DriverDisk(KickstartCommand): +class FC3_DriverDisk(KickstartCommand): def __init__(self, writePriority=0, driverdisk=""): KickstartCommand.__init__(self, writePriority) self.driverdisk = driverdisk diff --git a/pykickstart/commands/firewall.py b/pykickstart/commands/firewall.py index a86fb19..430c3c0 100644 --- a/pykickstart/commands/firewall.py +++ b/pykickstart/commands/firewall.py @@ -15,7 +15,7 @@ import string from pykickstart.base import * from pykickstart.options import * -class FC3Firewall(KickstartCommand): +class FC3_Firewall(KickstartCommand): def __init__(self, writePriority=0, enabled=True, ports=None, trusts=None): KickstartCommand.__init__(self, writePriority) self.enabled = enabled diff --git a/pykickstart/commands/firstboot.py b/pykickstart/commands/firstboot.py index 5e0b0b1..b1d2521 100644 --- a/pykickstart/commands/firstboot.py +++ b/pykickstart/commands/firstboot.py @@ -14,7 +14,7 @@ from pykickstart.base import * from pykickstart.constants import * from pykickstart.options import * -class FC3Firstboot(KickstartCommand): +class FC3_Firstboot(KickstartCommand): def __init__(self, writePriority=0, firstboot=FIRSTBOOT_SKIP): KickstartCommand.__init__(self, writePriority) self.firstboot = firstboot diff --git a/pykickstart/commands/ignoredisk.py b/pykickstart/commands/ignoredisk.py index 3e46044..23267f6 100644 --- a/pykickstart/commands/ignoredisk.py +++ b/pykickstart/commands/ignoredisk.py @@ -15,7 +15,7 @@ import string from pykickstart.base import * from pykickstart.options import * -class FC3IgnoreDisk(KickstartCommand): +class FC3_IgnoreDisk(KickstartCommand): def __init__(self, writePriority=0, ignoredisk=None): KickstartCommand.__init__(self, writePriority) diff --git a/pykickstart/commands/interactive.py b/pykickstart/commands/interactive.py index 2ad5a21..6078773 100644 --- a/pykickstart/commands/interactive.py +++ b/pykickstart/commands/interactive.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Interactive(KickstartCommand): +class FC3_Interactive(KickstartCommand): def __init__(self, writePriority=0, interactive=False): KickstartCommand.__init__(self, writePriority) self.interactive = interactive diff --git a/pykickstart/commands/iscsi.py b/pykickstart/commands/iscsi.py index 15f1198..0305ab6 100644 --- a/pykickstart/commands/iscsi.py +++ b/pykickstart/commands/iscsi.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6IscsiData(BaseData): +class FC6_IscsiData(BaseData): def __init__(self, ipaddr="", port="", target="", user=None, password=None): BaseData.__init__(self) self.ipaddr = ipaddr @@ -44,7 +44,7 @@ class FC6IscsiData(BaseData): return retval + "\n" -class FC6Iscsi(KickstartCommand): +class FC6_Iscsi(KickstartCommand): def __init__(self, writePriority=70, iscsi=None): KickstartCommand.__init__(self, writePriority) @@ -76,7 +76,7 @@ class FC6Iscsi(KickstartCommand): mapping = {"command": "scsi", "options": extra} raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Unexpected arguments to %(command)s command: %(options)s") % mapping) - dd = FC6IscsiData() + dd = FC6_IscsiData() self._setToObj(op, opts, dd) self.add(dd) diff --git a/pykickstart/commands/iscsiname.py b/pykickstart/commands/iscsiname.py index 8dd8ccd..0ca0baf 100644 --- a/pykickstart/commands/iscsiname.py +++ b/pykickstart/commands/iscsiname.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6IscsiName(KickstartCommand): +class FC6_IscsiName(KickstartCommand): def __init__(self, writePriority=71, iscsiname=""): KickstartCommand.__init__(self, writePriority) self.iscsiname = iscsiname diff --git a/pykickstart/commands/key.py b/pykickstart/commands/key.py index 6f8c62b..8fee76c 100644 --- a/pykickstart/commands/key.py +++ b/pykickstart/commands/key.py @@ -20,7 +20,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class F7Key(KickstartCommand): +class F7_Key(KickstartCommand): def __init__(self, writePriority=0, key=""): KickstartCommand.__init__(self, writePriority) self.key = key @@ -42,4 +42,4 @@ class F7Key(KickstartCommand): else: self.key = args[0] -RHEL5Key = F7Key +RHEL5_Key = F7_Key diff --git a/pykickstart/commands/keyboard.py b/pykickstart/commands/keyboard.py index 9bf1714..f81ccbb 100644 --- a/pykickstart/commands/keyboard.py +++ b/pykickstart/commands/keyboard.py @@ -18,7 +18,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Keyboard(KickstartCommand): +class FC3_Keyboard(KickstartCommand): def __init__(self, writePriority=0, keyboard=""): KickstartCommand.__init__(self, writePriority) self.keyboard = keyboard diff --git a/pykickstart/commands/lang.py b/pykickstart/commands/lang.py index eb9c5ae..a5cd174 100644 --- a/pykickstart/commands/lang.py +++ b/pykickstart/commands/lang.py @@ -18,7 +18,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Lang(KickstartCommand): +class FC3_Lang(KickstartCommand): def __init__(self, writePriority=0, lang=""): KickstartCommand.__init__(self, writePriority) self.lang = lang diff --git a/pykickstart/commands/langsupport.py b/pykickstart/commands/langsupport.py index 3c3ed76..4aa76a5 100644 --- a/pykickstart/commands/langsupport.py +++ b/pykickstart/commands/langsupport.py @@ -13,7 +13,7 @@ from pykickstart.base import * from pykickstart.options import * -class FC3LangSupport(KickstartCommand): +class FC3_LangSupport(KickstartCommand): def __init__(self, writePriority=0, deflang="en_US.UTF-8", supported=None): KickstartCommand.__init__(self, writePriority) self.deflang = deflang @@ -39,6 +39,6 @@ class FC3LangSupport(KickstartCommand): self.deflang = opts.deflang self.supported = extra -class FC5LangSupport(DeprecatedCommand): +class FC5_LangSupport(DeprecatedCommand): def __init__(self): DeprecatedCommand.__init__(self) diff --git a/pykickstart/commands/lilocheck.py b/pykickstart/commands/lilocheck.py index 3093e7a..46cbe40 100644 --- a/pykickstart/commands/lilocheck.py +++ b/pykickstart/commands/lilocheck.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3LiloCheck(KickstartCommand): +class FC3_LiloCheck(KickstartCommand): def __init__(self, writePriority=0, check=False): KickstartCommand.__init__(self, writePriority) self.check = check diff --git a/pykickstart/commands/logging.py b/pykickstart/commands/logging.py index 57b576f..d1190dd 100644 --- a/pykickstart/commands/logging.py +++ b/pykickstart/commands/logging.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6Logging(KickstartCommand): +class FC6_Logging(KickstartCommand): def __init__(self, writePriority=0, host="", level="info", port=""): KickstartCommand.__init__(self, writePriority) self.host = host diff --git a/pykickstart/commands/logvol.py b/pykickstart/commands/logvol.py index c18f898..6d0bc22 100644 --- a/pykickstart/commands/logvol.py +++ b/pykickstart/commands/logvol.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3LogVolData(BaseData): +class FC3_LogVolData(BaseData): def __init__(self, fstype="", grow=False, maxSizeMB=0, name="", format=True, percent=0, recommended=False, size=None, preexist=False, vgname="", mountpoint=""): @@ -58,12 +58,12 @@ class FC3LogVolData(BaseData): return retval + " --name=%s --vgname=%s\n" % (self.name, self.vgname) -class FC4LogVolData(FC3LogVolData): +class FC4_LogVolData(FC3_LogVolData): def __init__(self, bytesPerInode=4096, fsopts="", fstype="", grow=False, maxSizeMB=0, name="", format=True, percent=0, recommended=False, size=None, preexist=False, vgname="", mountpoint=""): - FC3LogVolData.__init__(self, fstype=fstype, grow=grow, + FC3_LogVolData.__init__(self, fstype=fstype, grow=grow, maxSizeMB=maxSizeMB, name=name, format=format, percent=percent, recommended=recommended, size=size, @@ -73,7 +73,7 @@ class FC4LogVolData(FC3LogVolData): self.fsopts = fsopts def __str__(self): - retval = FC3LogVolData.__str__(self).strip() + retval = FC3_LogVolData.__str__(self).strip() if self.bytesPerInode > 0: retval += " --bytes-per-inode=%d" % self.bytesPerInode @@ -82,7 +82,7 @@ class FC4LogVolData(FC3LogVolData): return retval + "\n" -class FC3LogVol(KickstartCommand): +class FC3_LogVol(KickstartCommand): def __init__(self, writePriority=132, lvList=None): KickstartCommand.__init__(self, writePriority) @@ -128,7 +128,7 @@ class FC3LogVol(KickstartCommand): if len(extra) == 0: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "logvol") - lvd = FC3LogVolData() + lvd = FC3_LogVolData() self._setToObj(op, opts, lvd) lvd.mountpoint=extra[0] self.add(lvd) @@ -136,9 +136,9 @@ class FC3LogVol(KickstartCommand): def add(self, newObj): self.lvList.append(newObj) -class FC4LogVol(FC3LogVol): +class FC4_LogVol(FC3_LogVol): def __init__(self, writePriority=132, lvList=None): - FC3LogVol.__init__(self, writePriority, lvList) + FC3_LogVol.__init__(self, writePriority, lvList) def parse(self, args): def lv_cb (option, opt_str, value, parser): @@ -172,7 +172,7 @@ class FC4LogVol(FC3LogVol): if len(extra) == 0: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "logvol") - lvd = FC4LogVolData() + lvd = FC4_LogVolData() self._setToObj(op, opts, lvd) lvd.mountpoint=extra[0] self.add(lvd) diff --git a/pykickstart/commands/mediacheck.py b/pykickstart/commands/mediacheck.py index 0289d2b..895fb04 100644 --- a/pykickstart/commands/mediacheck.py +++ b/pykickstart/commands/mediacheck.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC4MediaCheck(KickstartCommand): +class FC4_MediaCheck(KickstartCommand): def __init__(self, writePriority=0, mediacheck=False): KickstartCommand.__init__(self, writePriority) self.mediacheck = mediacheck diff --git a/pykickstart/commands/method.py b/pykickstart/commands/method.py index ea0f35d..0f130dc 100644 --- a/pykickstart/commands/method.py +++ b/pykickstart/commands/method.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Method(KickstartCommand): +class FC3_Method(KickstartCommand): def __init__(self, writePriority=0, method=""): KickstartCommand.__init__(self, writePriority) self.method = method @@ -68,9 +68,9 @@ class FC3Method(KickstartCommand): self._setToSelf(op, opts) -class FC6Method(FC3Method): +class FC6_Method(FC3_Method): def __init__(self, writePriority=0, method=""): - FC3Method.__init__(self, writePriority, method) + FC3_Method.__init__(self, writePriority, method) def __str__(self): if self.method == "cdrom": diff --git a/pykickstart/commands/monitor.py b/pykickstart/commands/monitor.py index b324c9f..0842bfc 100644 --- a/pykickstart/commands/monitor.py +++ b/pykickstart/commands/monitor.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Monitor(KickstartCommand): +class FC3_Monitor(KickstartCommand): def __init__(self, writePriority=0, hsync="", monitor="", vsync=""): KickstartCommand.__init__(self, writePriority) self.hsync = hsync @@ -55,10 +55,10 @@ class FC3Monitor(KickstartCommand): self._setToSelf(op, opts) -class FC6Monitor(FC3Monitor): +class FC6_Monitor(FC3_Monitor): def __init__(self, writePriority=0, hsync="", monitor="", probe=True, vsync=""): - FC3Monitor.__init__(self, writePriority, hsync=hsync, + FC3_Monitor.__init__(self, writePriority, hsync=hsync, monitor=monitor, vsync=vsync) self.probe = probe diff --git a/pykickstart/commands/mouse.py b/pykickstart/commands/mouse.py index a6eeb05..039733d 100644 --- a/pykickstart/commands/mouse.py +++ b/pykickstart/commands/mouse.py @@ -12,6 +12,6 @@ # from pykickstart.base import * -class FC3Mouse(DeprecatedCommand): +class FC3_Mouse(DeprecatedCommand): def __init__(self): DeprecatedCommand.__init__(self) diff --git a/pykickstart/commands/multipath.py b/pykickstart/commands/multipath.py index b0dfca7..dcf3f80 100644 --- a/pykickstart/commands/multipath.py +++ b/pykickstart/commands/multipath.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6MpPathData(BaseData): +class FC6_MpPathData(BaseData): def __init__(self, mpdev="", device="", rule=""): BaseData.__init__(self) self.mpdev = mpdev @@ -29,7 +29,7 @@ class FC6MpPathData(BaseData): def __str__(self): return " --device=%s --rule=\"%s\"" % (self.device, self.rule) -class FC6MultiPathData(BaseData): +class FC6_MultiPathData(BaseData): def __init__(self, name="", paths=None): BaseData.__init__(self) self.name = name @@ -47,7 +47,7 @@ class FC6MultiPathData(BaseData): return retval -class FC6MultiPath(KickstartCommand): +class FC6_MultiPath(KickstartCommand): def __init__(self, writePriority=50, mpaths=None): KickstartCommand.__init__(self, writePriority) @@ -73,7 +73,7 @@ class FC6MultiPath(KickstartCommand): required=1) (opts, extra) = op.parse_args(args=args) - dd = FC6MpPathData() + dd = FC6_MpPathData() self._setToObj(op, opts, dd) dd.mpdev = dd.mpdev.split('/')[-1] @@ -88,7 +88,7 @@ class FC6MultiPath(KickstartCommand): parent = x if parent is None: - mpath = FC6MultiPathData() + mpath = FC6_MultiPathData() self.add(mpath) else: mpath = self.mpaths[x] diff --git a/pykickstart/commands/network.py b/pykickstart/commands/network.py index f93fc85..e1f6eab 100644 --- a/pykickstart/commands/network.py +++ b/pykickstart/commands/network.py @@ -20,7 +20,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3NetworkData(BaseData): +class FC3_NetworkData(BaseData): def __init__(self, bootProto=BOOTPROTO_DHCP, dhcpclass="", device="", essid="", ethtool="", gateway="", hostname="", ip="", mtu="", nameserver="", netmask="", nodns=False, @@ -75,12 +75,12 @@ class FC3NetworkData(BaseData): return retval + "\n" -class FC4NetworkData(FC3NetworkData): +class FC4_NetworkData(FC3_NetworkData): def __init__(self, bootProto=BOOTPROTO_DHCP, dhcpclass="", device="", essid="", ethtool="", gateway="", hostname="", ip="", mtu="", nameserver="", netmask="", nodns=False, notksdevice=False, onboot=True, wepkey=""): - FC3NetworkData.__init__(self, bootProto=bootProto, + FC3_NetworkData.__init__(self, bootProto=bootProto, dhcpclass=dhcpclass, device=device, essid=essid, ethtool=ethtool, gateway=gateway, hostname=hostname, @@ -90,19 +90,19 @@ class FC4NetworkData(FC3NetworkData): self.notksdevice = notksdevice def __str__(self): - retval = FC3NetworkData.__str__(self).strip() + retval = FC3_NetworkData.__str__(self).strip() if self.notksdevice: retval += " --notksdevice" return retval + "\n" -class FC6NetworkData(FC4NetworkData): +class FC6_NetworkData(FC4_NetworkData): def __init__(self, bootProto=BOOTPROTO_DHCP, dhcpclass="", device="", essid="", ethtool="", gateway="", hostname="", ip="", ipv4=True, ipv6=True, mtu="", nameserver="", netmask="", nodns=False, notksdevice=False, onboot=True, wepkey=""): - FC4NetworkData.__init__(self, bootProto=bootProto, + FC4_NetworkData.__init__(self, bootProto=bootProto, dhcpclass=dhcpclass, device=device, essid=essid, ethtool=ethtool, gateway=gateway, hostname=hostname, @@ -153,12 +153,12 @@ class FC6NetworkData(FC4NetworkData): return retval + "\n" -class RHEL4NetworkData(FC3NetworkData): +class RHEL4_NetworkData(FC3_NetworkData): def __init__(self, bootProto=BOOTPROTO_DHCP, dhcpclass="", device="", essid="", ethtool="", gateway="", hostname="", ip="", mtu="", nameserver="", netmask="", nodns=False, notksdevice=False, onboot=True, wepkey=""): - FC3NetworkData.__init__(self, bootProto=bootProto, + FC3_NetworkData.__init__(self, bootProto=bootProto, dhcpclass=dhcpclass, device=device, essid=essid, ethtool=ethtool, gateway=gateway, hostname=hostname, @@ -168,14 +168,14 @@ class RHEL4NetworkData(FC3NetworkData): self.notksdevice = notksdevice def __str__(self): - retval = FC3NetworkData.__str__(self).strip() + retval = FC3_NetworkData.__str__(self).strip() if self.notksdevice: retval += " --notksdevice" return retval + "\n" -class FC3Network(KickstartCommand): +class FC3_Network(KickstartCommand): def __init__(self, writePriority=0, network=None): KickstartCommand.__init__(self, writePriority) @@ -218,16 +218,16 @@ class FC3Network(KickstartCommand): op.add_option("--wepkey", dest="wepkey") (opts, extra) = op.parse_args(args=args) - nd = FC3NetworkData() + nd = FC3_NetworkData() self._setToObj(op, opts, nd) self.add(nd) def add(self, newObj): self.network.append(newObj) -class FC4Network(FC3Network): +class FC4_Network(FC3_Network): def __init__(self, writePriority=0, network=None): - FC3Network.__init__(self, writePriority, network) + FC3_Network.__init__(self, writePriority, network) def parse(self, args): op = KSOptionParser(lineno=self.lineno) @@ -254,13 +254,13 @@ class FC4Network(FC3Network): op.add_option("--wepkey", dest="wepkey") (opts, extra) = op.parse_args(args=args) - nd = FC4NetworkData() + nd = FC4_NetworkData() self._setToObj(op, opts, nd) self.add(nd) -class FC6Network(FC4Network): +class FC6_Network(FC4_Network): def __init__(self, writePriority=0, network=None): - FC4Network.__init__(self, writePriority, network) + FC4_Network.__init__(self, writePriority, network) def parse(self, args): op = KSOptionParser(lineno=self.lineno) @@ -291,13 +291,13 @@ class FC6Network(FC4Network): op.add_option("--wepkey", dest="wepkey") (opts, extra) = op.parse_args(args=args) - nd = FC6NetworkData() + nd = FC6_NetworkData() self._setToObj(op, opts, nd) self.add(nd) -class RHEL4Network(FC3Network): +class RHEL4_Network(FC3_Network): def __init__(self, writePriority=0, network=None): - FC3Network.__init__(self, writePriority, network) + FC3_Network.__init__(self, writePriority, network) def parse(self, args): op = KSOptionParser(lineno=self.lineno) @@ -324,6 +324,6 @@ class RHEL4Network(FC3Network): op.add_option("--wepkey", dest="wepkey") (opts, extra) = op.parse_args(args=args) - nd = RHEL4NetworkData() + nd = RHEL4_NetworkData() self._setToObj(op, opts, nd) self.add(nd) diff --git a/pykickstart/commands/partition.py b/pykickstart/commands/partition.py index 761e424..602ecf6 100644 --- a/pykickstart/commands/partition.py +++ b/pykickstart/commands/partition.py @@ -14,7 +14,7 @@ from pykickstart.base import * from pykickstart.errors import * from pykickstart.options import * -class FC3PartData(BaseData): +class FC3_PartData(BaseData): def __init__(self, active=False, primOnly=False, end=0, fstype="", grow=False, maxSizeMB=0, format=True, onbiosdisk="", disk="", onPart="", recommended=False, size=None, @@ -67,13 +67,13 @@ class FC3PartData(BaseData): return retval + "\n" -class FC4PartData(FC3PartData): +class FC4_PartData(FC3_PartData): def __init__(self, active=False, primOnly=False, bytesPerInode=4096, end=0, fsopts="", fstype="", grow=False, label="", maxSizeMB=0, format=True, onbiosdisk="", disk="", onPart="", recommended=False, size=None, start=0, mountpoint=""): - FC3PartData.__init__(self, active=active, primOnly=primOnly, + FC3_PartData.__init__(self, active=active, primOnly=primOnly, end=end, fstype=fstype, grow=grow, maxSizeMB=maxSizeMB, format=format, onbiosdisk=onbiosdisk, disk=disk, @@ -85,7 +85,7 @@ class FC4PartData(FC3PartData): self.label = label def __str__(self): - retval = FC3PartData.__str__(self).strip() + retval = FC3_PartData.__str__(self).strip() if self.bytesPerInode != 0: retval += " --bytes-per-inode=%d" % self.bytesPerInode @@ -96,7 +96,7 @@ class FC4PartData(FC3PartData): return retval + "\n" -class FC3Partition(KickstartCommand): +class FC3_Partition(KickstartCommand): def __init__(self, writePriority=130, partitions=None): KickstartCommand.__init__(self, writePriority) @@ -152,7 +152,7 @@ class FC3Partition(KickstartCommand): if len(extra) != 1: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "partition") - pd = FC3PartData() + pd = FC3_PartData() self._setToObj(op, opts, pd) pd.mountpoint=extra[0] self.add(pd) @@ -160,9 +160,9 @@ class FC3Partition(KickstartCommand): def add(self, newObj): self.partitions.append(newObj) -class FC4Partition(FC3Partition): +class FC4_Partition(FC3_Partition): def __init__(self, writePriority=130, partitions=None): - FC3Partition.__init__(self, writePriority, partitions) + FC3_Partition.__init__(self, writePriority, partitions) def parse(self, args): def part_cb (option, opt_str, value, parser): @@ -204,7 +204,7 @@ class FC4Partition(FC3Partition): if len(extra) != 1: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "partition") - pd = FC4PartData() + pd = FC4_PartData() self._setToObj(op, opts, pd) pd.mountpoint=extra[0] self.add(pd) diff --git a/pykickstart/commands/raid.py b/pykickstart/commands/raid.py index ba51e0a..ae87af3 100644 --- a/pykickstart/commands/raid.py +++ b/pykickstart/commands/raid.py @@ -16,7 +16,7 @@ from pykickstart.base import * from pykickstart.errors import * from pykickstart.options import * -class FC3RaidData(BaseData): +class FC3_RaidData(BaseData): def __init__(self, device=None, fstype="", level="", format=True, spares=0, preexist=False, mountpoint="", members=None): BaseData.__init__(self) @@ -51,11 +51,11 @@ class FC3RaidData(BaseData): return retval + " %s\n" % string.join(self.members) -class FC4RaidData(FC3RaidData): +class FC4_RaidData(FC3_RaidData): def __init__(self, device=None, fsopts="", fstype="", level="", format=True, spares=0, preexist=False, mountpoint="", members=None): - FC3RaidData.__init__(self, device=device, fstype=fstype, + FC3_RaidData.__init__(self, device=device, fstype=fstype, level=level, format=format, spares=spares, preexist=preexist, mountpoint=mountpoint, @@ -63,18 +63,18 @@ class FC4RaidData(FC3RaidData): self.fsopts = fsopts def __str__(self): - retval = FC4RaidData.__str__(self).strip() + retval = FC4_RaidData.__str__(self).strip() if self.fsopts != "": retval += " --fsoptions=\"%s\"" % self.fsopts return retval -class FC5RaidData(FC4RaidData): +class FC5_RaidData(FC4_RaidData): def __init__(self, device=None, fsopts="", fstype="", level="", format=True, spares=0, preexist=False, mountpoint="", members=None, bytesPerInode=4096): - FC4RaidData.__init__(self, device=device, fsopts=fsopts, + FC4_RaidData.__init__(self, device=device, fsopts=fsopts, fstype=fstype, level=level, format=format, spares=spares, preexist=preexist, @@ -103,7 +103,7 @@ class FC5RaidData(FC4RaidData): return retval + " %s\n" % string.join(self.members) -class FC3Raid(KickstartCommand): +class FC3_Raid(KickstartCommand): def __init__(self, writePriority=140, raidList=None): KickstartCommand.__init__(self, writePriority) @@ -159,7 +159,7 @@ class FC3Raid(KickstartCommand): if len(extra) == 0: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "raid") - rd = FC3RaidData() + rd = FC3_RaidData() self._setToObj(op, opts, rd) # --device can't just take an int in the callback above, because it @@ -173,9 +173,9 @@ class FC3Raid(KickstartCommand): def add(self, newObj): self.raidList.append(newObj) -class FC4Raid(FC3Raid): +class FC4_Raid(FC3_Raid): def __init__(self, writePriority=140, raidList=None): - FC3Raid.__init__(self, writePriority, raidList) + FC3_Raid.__init__(self, writePriority, raidList) def parse(self, args): def raid_cb (option, opt_str, value, parser): @@ -217,7 +217,7 @@ class FC4Raid(FC3Raid): if len(extra) == 0: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "raid") - rd = FC4RaidData() + rd = FC4_RaidData() self._setToObj(op, opts, rd) # --device can't just take an int in the callback above, because it @@ -228,9 +228,9 @@ class FC4Raid(FC3Raid): rd.members = extra[1:] self.add(rd) -class FC5Raid(FC4Raid): +class FC5_Raid(FC4_Raid): def __init__(self, writePriority=140, raidList=None): - FC4Raid.__init__(self, writePriority, raidList) + FC4_Raid.__init__(self, writePriority, raidList) def reset(self): self.raidList = [] @@ -277,7 +277,7 @@ class FC5Raid(FC4Raid): if len(extra) == 0: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Mount point required for %s") % "raid") - rd = FC5RaidData() + rd = FC5_RaidData() self._setToObj(op, opts, rd) # --device can't just take an int in the callback above, because it diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py index cab26ba..63fe7a1 100644 --- a/pykickstart/commands/reboot.py +++ b/pykickstart/commands/reboot.py @@ -20,7 +20,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Reboot(KickstartCommand): +class FC3_Reboot(KickstartCommand): def __init__(self, writePriority=0, action=KS_WAIT): KickstartCommand.__init__(self, writePriority) self.action = action @@ -37,9 +37,9 @@ class FC3Reboot(KickstartCommand): else: self.action = KS_SHUTDOWN -class FC6Reboot(FC3Reboot): +class FC6_Reboot(FC3_Reboot): def __init__(self, writePriority=0, action=KS_WAIT, eject=False): - FC3Reboot.__init__(self, writePriority, action=action) + FC3_Reboot.__init__(self, writePriority, action=action) self.eject = eject def __str__(self): diff --git a/pykickstart/commands/repo.py b/pykickstart/commands/repo.py index 9beabed..9667594 100644 --- a/pykickstart/commands/repo.py +++ b/pykickstart/commands/repo.py @@ -20,7 +20,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6RepoData(BaseData): +class FC6_RepoData(BaseData): def __init__(self, baseurl="", mirrorlist="", name=""): BaseData.__init__(self) self.baseurl = baseurl @@ -35,7 +35,7 @@ class FC6RepoData(BaseData): return "repo --name=%s %s\n" % (self.name, urlopt) -class FC6Repo(KickstartCommand): +class FC6_Repo(KickstartCommand): def __init__(self, writePriority=0, repoList=None): KickstartCommand.__init__(self, writePriority) @@ -67,7 +67,7 @@ class FC6Repo(KickstartCommand): if not opts.baseurl and not opts.mirrorlist: raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("One of --baseurl or --mirrorlist must be specified for repo command.")) - rd = FC6RepoData() + rd = FC6_RepoData() self._setToObj(op, opts, rd) self.add(rd) diff --git a/pykickstart/commands/rootpw.py b/pykickstart/commands/rootpw.py index bad3e84..99d0e90 100644 --- a/pykickstart/commands/rootpw.py +++ b/pykickstart/commands/rootpw.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3RootPw(KickstartCommand): +class FC3_RootPw(KickstartCommand): def __init__(self, writePriority=0, isCrypted=False, password=""): KickstartCommand.__init__(self, writePriority) self.isCrypted = isCrypted diff --git a/pykickstart/commands/selinux.py b/pykickstart/commands/selinux.py index cd091a8..6952a37 100644 --- a/pykickstart/commands/selinux.py +++ b/pykickstart/commands/selinux.py @@ -14,7 +14,7 @@ from pykickstart.base import * from pykickstart.constants import * from pykickstart.options import * -class FC3SELinux(KickstartCommand): +class FC3_SELinux(KickstartCommand): def __init__(self, writePriority=0, selinux=SELINUX_ENFORCING): KickstartCommand.__init__(self, writePriority) self.selinux = selinux diff --git a/pykickstart/commands/services.py b/pykickstart/commands/services.py index 2542df3..070873a 100644 --- a/pykickstart/commands/services.py +++ b/pykickstart/commands/services.py @@ -21,7 +21,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6Services(KickstartCommand): +class FC6_Services(KickstartCommand): def __init__(self, writePriority=0, disabled=None, enabled=None): KickstartCommand.__init__(self, writePriority) diff --git a/pykickstart/commands/skipx.py b/pykickstart/commands/skipx.py index faa0933..d2c3dd6 100644 --- a/pykickstart/commands/skipx.py +++ b/pykickstart/commands/skipx.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3SkipX(KickstartCommand): +class FC3_SkipX(KickstartCommand): def __init__(self, writePriority=0, skipx=False): KickstartCommand.__init__(self, writePriority) self.skipx = skipx diff --git a/pykickstart/commands/timezone.py b/pykickstart/commands/timezone.py index ca5a371..c2bb841 100644 --- a/pykickstart/commands/timezone.py +++ b/pykickstart/commands/timezone.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Timezone(KickstartCommand): +class FC3_Timezone(KickstartCommand): def __init__(self, writePriority=0, isUtc=False, timezone=""): KickstartCommand.__init__(self, writePriority) self.isUtc = isUtc diff --git a/pykickstart/commands/upgrade.py b/pykickstart/commands/upgrade.py index 7d04807..ec998bd 100644 --- a/pykickstart/commands/upgrade.py +++ b/pykickstart/commands/upgrade.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Upgrade(KickstartCommand): +class FC3_Upgrade(KickstartCommand): def __init__(self, writePriority=0, upgrade=False): KickstartCommand.__init__(self, writePriority) self.upgrade = upgrade diff --git a/pykickstart/commands/user.py b/pykickstart/commands/user.py index 7504711..c83e386 100644 --- a/pykickstart/commands/user.py +++ b/pykickstart/commands/user.py @@ -22,7 +22,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC6UserData(BaseData): +class FC6_UserData(BaseData): def __init__(self, groups=None, homedir="", isCrypted=False, name="", password="", shell="", uid=None): BaseData.__init__(self) @@ -58,7 +58,7 @@ class FC6UserData(BaseData): return retval + "\n" -class FC6User(KickstartCommand): +class FC6_User(KickstartCommand): def __init__(self, writePriority=0, userList=None): KickstartCommand.__init__(self, writePriority) @@ -90,7 +90,7 @@ class FC6User(KickstartCommand): op.add_option("--shell") op.add_option("--uid", type="int") - ud = FC6UserData() + ud = FC6_UserData() (opts, extra) = op.parse_args(args=args) self._setToObj(op, opts, ud) self.add(ud) diff --git a/pykickstart/commands/vnc.py b/pykickstart/commands/vnc.py index b6e5c72..1ea9224 100644 --- a/pykickstart/commands/vnc.py +++ b/pykickstart/commands/vnc.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3Vnc(KickstartCommand): +class FC3_Vnc(KickstartCommand): def __init__(self, writePriority=0, enabled=False, password="", connect=""): KickstartCommand.__init__(self, writePriority) self.enabled = enabled @@ -49,10 +49,10 @@ class FC3Vnc(KickstartCommand): (opts, extra) = op.parse_args(args=args) self._setToSelf(op, opts) -class FC6Vnc(FC3Vnc): +class FC6_Vnc(FC3_Vnc): def __init__(self, writePriority=0, enabled=False, password="", host="", port=""): - FC3Vnc.__init__(self, writePriority) + FC3_Vnc.__init__(self, writePriority) self.enabled = enabled self.password = password self.host = host diff --git a/pykickstart/commands/volgroup.py b/pykickstart/commands/volgroup.py index dc78b63..4ee776e 100644 --- a/pykickstart/commands/volgroup.py +++ b/pykickstart/commands/volgroup.py @@ -15,7 +15,7 @@ import string from pykickstart.base import * from pykickstart.options import * -class FC3VolGroupData(BaseData): +class FC3_VolGroupData(BaseData): def __init__(self, format=True, pesize=32768, preexist=False, vgname="", physvols=None): BaseData.__init__(self) @@ -41,7 +41,7 @@ class FC3VolGroupData(BaseData): return retval + " " + string.join(self.physvols, ",") + "\n" -class FC3VolGroup(KickstartCommand): +class FC3_VolGroup(KickstartCommand): def __init__(self, writePriority=131, vgList=None): KickstartCommand.__init__(self, writePriority) @@ -72,7 +72,7 @@ class FC3VolGroup(KickstartCommand): default=False) (opts, extra) = op.parse_args(args=args) - vg = FC3VolGroupData() + vg = FC3_VolGroupData() self._setToObj(op, opts, vg) vg.vgname = extra[0] vg.physvols = extra[1:] diff --git a/pykickstart/commands/xconfig.py b/pykickstart/commands/xconfig.py index e0502de..d9fe473 100644 --- a/pykickstart/commands/xconfig.py +++ b/pykickstart/commands/xconfig.py @@ -19,7 +19,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3XConfig(KickstartCommand): +class FC3_XConfig(KickstartCommand): def __init__(self, writePriority=0, card="", defaultdesktop="", depth=0, hsync="", monitor="", noProbe=False, resolution="", server="", startX=False, videoRam="", vsync=""): @@ -90,10 +90,10 @@ class FC3XConfig(KickstartCommand): self._setToSelf(op, opts) -class FC6XConfig(FC3XConfig): +class FC6_XConfig(FC3_XConfig): def __init__(self, writePriority=0, driver="", defaultdesktop="", depth=0, resolution="", startX=False, videoRam=""): - FC3XConfig.__init__(self, writePriority) + FC3_XConfig.__init__(self, writePriority) self.driver = driver self.defaultdesktop = defaultdesktop self.depth = depth diff --git a/pykickstart/commands/zerombr.py b/pykickstart/commands/zerombr.py index 570fea5..1718aae 100644 --- a/pykickstart/commands/zerombr.py +++ b/pykickstart/commands/zerombr.py @@ -20,7 +20,7 @@ import rhpl.translate as translate translate.textdomain("pykickstart") -class FC3ZeroMbr(KickstartCommand): +class FC3_ZeroMbr(KickstartCommand): def __init__(self, writePriority=110, zerombr=False): KickstartCommand.__init__(self, writePriority) self.zerombr = zerombr diff --git a/pykickstart/commands/zfcp.py b/pykickstart/commands/zfcp.py index 0c46c33..407c5bb 100644 --- a/pykickstart/commands/zfcp.py +++ b/pykickstart/commands/zfcp.py @@ -13,7 +13,7 @@ from pykickstart.base import * from pykickstart.options import * -class FC3ZFCPData(BaseData): +class FC3_ZFCPData(BaseData): def __init__(self, devnum="", wwpn="", fcplun="", scsiid="", scsilun=""): BaseData.__init__(self) self.devnum = devnum @@ -38,7 +38,7 @@ class FC3ZFCPData(BaseData): return retval + "\n" -class FC3ZFCP(KickstartCommand): +class FC3_ZFCP(KickstartCommand): def __init__(self, writePriority=0, zfcp=None): KickstartCommand.__init__(self, writePriority) @@ -62,7 +62,7 @@ class FC3ZFCP(KickstartCommand): op.add_option("--scsilun", dest="scsilun", required=1) op.add_option("--wwpn", dest="wwpn", required=1) - zd = FC3ZFCPData() + zd = FC3_ZFCPData() (opts, extra) = op.parse_args(args) self._setToObj(op, opts, zd) self.add(zd) diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py dissimilarity index 95% index 9cc1a23..b9350eb 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -1,391 +1,391 @@ -# -# Chris Lumens -# -# Copyright 2007 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# general public license. -# -# 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., 675 Mass Ave, Cambridge, MA 02139, USA. -# -from pykickstart.version import * -from pykickstart.commands import * - -commandMap = { - FC3: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC3Bootloader, - "cdrom": method.FC3Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC3Reboot, - "harddrive": method.FC3Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC3LangSupport, - "lilo": bootloader.FC3Bootloader, - "lilocheck": lilocheck.FC3LiloCheck, - "logvol": logvol.FC3LogVol, - "monitor": monitor.FC3Monitor, - "mouse": mouse.FC3Mouse, - "network": network.FC3Network, - "nfs": method.FC3Method, - "part": partition.FC3Partition, - "partition": partition.FC3Partition, - "poweroff": reboot.FC3Reboot, - "raid": raid.FC3Raid, - "reboot": reboot.FC3Reboot, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "shutdown": reboot.FC3Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "url": method.FC3Method, - "vnc": vnc.FC3Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC3XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc3 - FC4: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC4Bootloader, - "cdrom": method.FC3Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC3Reboot, - "harddrive": method.FC3Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC3LangSupport, - "logvol": logvol.FC4LogVol, - "mediacheck": mediacheck.FC4MediaCheck, - "monitor": monitor.FC3Monitor, - "mouse": mouse.FC3Mouse, - "network": network.FC4Network, - "nfs": method.FC3Method, - "part": partition.FC4Partition, - "partition": partition.FC4Partition, - "poweroff": reboot.FC3Reboot, - "raid": raid.FC4Raid, - "reboot": reboot.FC3Reboot, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "shutdown": reboot.FC3Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "url": method.FC3Method, - "vnc": vnc.FC3Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC3XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc4 - FC5: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC4Bootloader, - "cdrom": method.FC3Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC3Reboot, - "harddrive": method.FC3Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC5LangSupport, - "logvol": logvol.FC4LogVol, - "mediacheck": mediacheck.FC4MediaCheck, - "monitor": monitor.FC3Monitor, - "mouse": mouse.FC3Mouse, - "network": network.FC4Network, - "nfs": method.FC3Method, - "part": partition.FC4Partition, - "partition": partition.FC4Partition, - "poweroff": reboot.FC3Reboot, - "raid": raid.FC5Raid, - "reboot": reboot.FC3Reboot, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "shutdown": reboot.FC3Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "url": method.FC3Method, - "vnc": vnc.FC3Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC3XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc5 - FC6: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC4Bootloader, - "cdrom": method.FC6Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "dmraid": dmraid.FC6DmRaid, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC6Reboot, - "harddrive": method.FC6Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "iscsi": iscsi.FC6Iscsi, - "iscsiname": iscsiname.FC6IscsiName, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC5LangSupport, - "logging": logging.FC6Logging, - "logvol": logvol.FC4LogVol, - "mediacheck": mediacheck.FC4MediaCheck, - "monitor": monitor.FC6Monitor, - "mouse": mouse.FC3Mouse, - "multipath": multipath.FC6MultiPath, - "network": network.FC6Network, - "nfs": method.FC6Method, - "part": partition.FC4Partition, - "partition": partition.FC4Partition, - "poweroff": reboot.FC6Reboot, - "raid": raid.FC5Raid, - "reboot": reboot.FC6Reboot, - "repo": repo.FC6Repo, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "services": services.FC6Services, - "shutdown": reboot.FC6Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "user": user.FC6User, - "url": method.FC6Method, - "vnc": vnc.FC6Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC6XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc6 - F7: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC4Bootloader, - "cdrom": method.FC6Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "dmraid": dmraid.FC6DmRaid, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC6Reboot, - "harddrive": method.FC6Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "iscsi": iscsi.FC6Iscsi, - "iscsiname": iscsiname.FC6IscsiName, - "key": key.F7Key, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "logging": logging.FC6Logging, - "logvol": logvol.FC4LogVol, - "mediacheck": mediacheck.FC4MediaCheck, - "monitor": monitor.FC6Monitor, - "multipath": multipath.FC6MultiPath, - "network": network.FC6Network, - "nfs": method.FC6Method, - "part": partition.FC4Partition, - "partition": partition.FC4Partition, - "poweroff": reboot.FC6Reboot, - "raid": raid.FC5Raid, - "reboot": reboot.FC6Reboot, - "repo": repo.FC6Repo, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "services": services.FC6Services, - "shutdown": reboot.FC6Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "url": method.FC6Method, - "user": user.FC6User, - "vnc": vnc.FC6Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC6XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc3 - RHEL4: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC3Bootloader, - "cdrom": method.FC3Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC3Reboot, - "harddrive": method.FC3Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC3LangSupport, - "lilo": bootloader.FC3Bootloader, - "lilocheck": lilocheck.FC3LiloCheck, - "logvol": logvol.FC3LogVol, - "monitor": monitor.FC3Monitor, - "mouse": mouse.FC3Mouse, - "network": network.RHEL4Network, - "nfs": method.FC3Method, - "part": partition.FC3Partition, - "partition": partition.FC3Partition, - "poweroff": reboot.FC3Reboot, - "raid": raid.FC3Raid, - "reboot": reboot.FC3Reboot, - "rootpw": rootpw.FC3RootPw, - "selinux": selinux.FC3SELinux, - "shutdown": reboot.FC3Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "url": method.FC3Method, - "vnc": vnc.FC3Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC3XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - }, - - # based on fc6 - RHEL5: { - "auth": authconfig.FC3Authconfig, - "authconfig": authconfig.FC3Authconfig, - "autopart": autopart.FC3AutoPart, - "autostep": autostep.FC3AutoStep, - "bootloader": bootloader.FC4Bootloader, - "cdrom": method.FC6Method, - "clearpart": clearpart.FC3ClearPart, - "cmdline": displaymode.FC3DisplayMode, - "device": device.FC3Device, - "deviceprobe": deviceprobe.FC3DeviceProbe, - "dmraid": dmraid.FC6DmRaid, - "driverdisk": driverdisk.FC3DriverDisk, - "firewall": firewall.FC3Firewall, - "firstboot": firstboot.FC3Firstboot, - "graphical": displaymode.FC3DisplayMode, - "halt": reboot.FC6Reboot, - "harddrive": method.FC6Method, - "ignoredisk": ignoredisk.FC3IgnoreDisk, - "install": upgrade.FC3Upgrade, - "interactive": interactive.FC3Interactive, - "iscsi": iscsi.FC6Iscsi, - "iscsiname": iscsiname.FC6IscsiName, - "key": key.RHEL5Key, - "keyboard": keyboard.FC3Keyboard, - "lang": lang.FC3Lang, - "langsupport": langsupport.FC5LangSupport, - "logging": logging.FC6Logging, - "logvol": logvol.FC4LogVol, - "mediacheck": mediacheck.FC4MediaCheck, - "monitor": monitor.FC6Monitor, - "mouse": mouse.FC3Mouse, - "multipath": multipath.FC6MultiPath, - "network": network.FC6Network, - "nfs": method.FC6Method, - "part": partition.FC4Partition, - "partition": partition.FC4Partition, - "poweroff": reboot.FC6Reboot, - "raid": raid.FC5Raid, - "reboot": reboot.FC6Reboot, - "repo": repo.FC6Repo, - "rootpw": rootpw.FC3RootPw, - "services": services.FC6Services, - "selinux": selinux.FC3SELinux, - "shutdown": reboot.FC6Reboot, - "skipx": skipx.FC3SkipX, - "text": displaymode.FC3DisplayMode, - "timezone": timezone.FC3Timezone, - "upgrade": upgrade.FC3Upgrade, - "user": user.FC6User, - "url": method.FC6Method, - "vnc": vnc.FC6Vnc, - "volgroup": volgroup.FC3VolGroup, - "xconfig": xconfig.FC6XConfig, - "zerombr": zerombr.FC3ZeroMbr, - "zfcp": zfcp.FC3ZFCP, - } -} +# +# Chris Lumens +# +# Copyright 2007 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# general public license. +# +# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +from pykickstart.version import * +from pykickstart.commands import * + +commandMap = { + FC3: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC3_Bootloader, + "cdrom": method.FC3_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC3_Reboot, + "harddrive": method.FC3_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC3_LangSupport, + "lilo": bootloader.FC3_Bootloader, + "lilocheck": lilocheck.FC3_LiloCheck, + "logvol": logvol.FC3_LogVol, + "monitor": monitor.FC3_Monitor, + "mouse": mouse.FC3_Mouse, + "network": network.FC3_Network, + "nfs": method.FC3_Method, + "part": partition.FC3_Partition, + "partition": partition.FC3_Partition, + "poweroff": reboot.FC3_Reboot, + "raid": raid.FC3_Raid, + "reboot": reboot.FC3_Reboot, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "shutdown": reboot.FC3_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "url": method.FC3_Method, + "vnc": vnc.FC3_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC3_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc3 + FC4: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC4_Bootloader, + "cdrom": method.FC3_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC3_Reboot, + "harddrive": method.FC3_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC3_LangSupport, + "logvol": logvol.FC4_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.FC3_Monitor, + "mouse": mouse.FC3_Mouse, + "network": network.FC4_Network, + "nfs": method.FC3_Method, + "part": partition.FC4_Partition, + "partition": partition.FC4_Partition, + "poweroff": reboot.FC3_Reboot, + "raid": raid.FC4_Raid, + "reboot": reboot.FC3_Reboot, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "shutdown": reboot.FC3_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "url": method.FC3_Method, + "vnc": vnc.FC3_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC3_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc4 + FC5: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC4_Bootloader, + "cdrom": method.FC3_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC3_Reboot, + "harddrive": method.FC3_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC5_LangSupport, + "logvol": logvol.FC4_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.FC3_Monitor, + "mouse": mouse.FC3_Mouse, + "network": network.FC4_Network, + "nfs": method.FC3_Method, + "part": partition.FC4_Partition, + "partition": partition.FC4_Partition, + "poweroff": reboot.FC3_Reboot, + "raid": raid.FC5_Raid, + "reboot": reboot.FC3_Reboot, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "shutdown": reboot.FC3_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "url": method.FC3_Method, + "vnc": vnc.FC3_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC3_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc5 + FC6: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC4_Bootloader, + "cdrom": method.FC6_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "dmraid": dmraid.FC6_DmRaid, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC6_Reboot, + "harddrive": method.FC6_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "iscsi": iscsi.FC6_Iscsi, + "iscsiname": iscsiname.FC6_IscsiName, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC5_LangSupport, + "logging": logging.FC6_Logging, + "logvol": logvol.FC4_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.FC6_Monitor, + "mouse": mouse.FC3_Mouse, + "multipath": multipath.FC6_MultiPath, + "network": network.FC6_Network, + "nfs": method.FC6_Method, + "part": partition.FC4_Partition, + "partition": partition.FC4_Partition, + "poweroff": reboot.FC6_Reboot, + "raid": raid.FC5_Raid, + "reboot": reboot.FC6_Reboot, + "repo": repo.FC6_Repo, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "services": services.FC6_Services, + "shutdown": reboot.FC6_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "user": user.FC6_User, + "url": method.FC6_Method, + "vnc": vnc.FC6_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC6_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc6 + F7: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC4_Bootloader, + "cdrom": method.FC6_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "dmraid": dmraid.FC6_DmRaid, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC6_Reboot, + "harddrive": method.FC6_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "iscsi": iscsi.FC6_Iscsi, + "iscsiname": iscsiname.FC6_IscsiName, + "key": key.F7_Key, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "logging": logging.FC6_Logging, + "logvol": logvol.FC4_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.FC6_Monitor, + "multipath": multipath.FC6_MultiPath, + "network": network.FC6_Network, + "nfs": method.FC6_Method, + "part": partition.FC4_Partition, + "partition": partition.FC4_Partition, + "poweroff": reboot.FC6_Reboot, + "raid": raid.FC5_Raid, + "reboot": reboot.FC6_Reboot, + "repo": repo.FC6_Repo, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "services": services.FC6_Services, + "shutdown": reboot.FC6_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "url": method.FC6_Method, + "user": user.FC6_User, + "vnc": vnc.FC6_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC6_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc3 + RHEL4: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC3_Bootloader, + "cdrom": method.FC3_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC3_Reboot, + "harddrive": method.FC3_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC3_LangSupport, + "lilo": bootloader.FC3_Bootloader, + "lilocheck": lilocheck.FC3_LiloCheck, + "logvol": logvol.FC3_LogVol, + "monitor": monitor.FC3_Monitor, + "mouse": mouse.FC3_Mouse, + "network": network.RHEL4_Network, + "nfs": method.FC3_Method, + "part": partition.FC3_Partition, + "partition": partition.FC3_Partition, + "poweroff": reboot.FC3_Reboot, + "raid": raid.FC3_Raid, + "reboot": reboot.FC3_Reboot, + "rootpw": rootpw.FC3_RootPw, + "selinux": selinux.FC3_SELinux, + "shutdown": reboot.FC3_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "url": method.FC3_Method, + "vnc": vnc.FC3_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC3_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + }, + + # based on fc6 + RHEL5: { + "auth": authconfig.FC3_Authconfig, + "authconfig": authconfig.FC3_Authconfig, + "autopart": autopart.FC3_AutoPart, + "autostep": autostep.FC3_AutoStep, + "bootloader": bootloader.FC4_Bootloader, + "cdrom": method.FC6_Method, + "clearpart": clearpart.FC3_ClearPart, + "cmdline": displaymode.FC3_DisplayMode, + "device": device.FC3_Device, + "deviceprobe": deviceprobe.FC3_DeviceProbe, + "dmraid": dmraid.FC6_DmRaid, + "driverdisk": driverdisk.FC3_DriverDisk, + "firewall": firewall.FC3_Firewall, + "firstboot": firstboot.FC3_Firstboot, + "graphical": displaymode.FC3_DisplayMode, + "halt": reboot.FC6_Reboot, + "harddrive": method.FC6_Method, + "ignoredisk": ignoredisk.FC3_IgnoreDisk, + "install": upgrade.FC3_Upgrade, + "interactive": interactive.FC3_Interactive, + "iscsi": iscsi.FC6_Iscsi, + "iscsiname": iscsiname.FC6_IscsiName, + "key": key.RHEL5_Key, + "keyboard": keyboard.FC3_Keyboard, + "lang": lang.FC3_Lang, + "langsupport": langsupport.FC5_LangSupport, + "logging": logging.FC6_Logging, + "logvol": logvol.FC4_LogVol, + "mediacheck": mediacheck.FC4_MediaCheck, + "monitor": monitor.FC6_Monitor, + "mouse": mouse.FC3_Mouse, + "multipath": multipath.FC6_MultiPath, + "network": network.FC6_Network, + "nfs": method.FC6_Method, + "part": partition.FC4_Partition, + "partition": partition.FC4_Partition, + "poweroff": reboot.FC6_Reboot, + "raid": raid.FC5_Raid, + "reboot": reboot.FC6_Reboot, + "repo": repo.FC6_Repo, + "rootpw": rootpw.FC3_RootPw, + "services": services.FC6_Services, + "selinux": selinux.FC3_SELinux, + "shutdown": reboot.FC6_Reboot, + "skipx": skipx.FC3_SkipX, + "text": displaymode.FC3_DisplayMode, + "timezone": timezone.FC3_Timezone, + "upgrade": upgrade.FC3_Upgrade, + "user": user.FC6_User, + "url": method.FC6_Method, + "vnc": vnc.FC6_Vnc, + "volgroup": volgroup.FC3_VolGroup, + "xconfig": xconfig.FC6_XConfig, + "zerombr": zerombr.FC3_ZeroMbr, + "zfcp": zfcp.FC3_ZFCP, + } +} -- 2.11.4.GIT