diff --git a/pykickstart/commands/logvol.py b/pykickstart/commands/logvol.py index aa487ac..3a8ee66 100644 --- a/pykickstart/commands/logvol.py +++ b/pykickstart/commands/logvol.py @@ -92,6 +92,33 @@ class FC4_LogVolData(FC3_LogVolData): return retval +class RHEL5_LogVolData(FC3_LogVolData): + def __init__(self, fsopts="", fstype="", grow=False, + maxSizeMB=0, name="", format=True, percent=0, + recommended=False, size=None, preexist=False, vgname="", + bytesPerInode=4096, mountpoint="", encrypted=False, + passphrase=""): + FC3_LogVolData.__init__(self, fstype=fstype, grow=grow, + maxSizeMB=maxSizeMB, name=name, + format=format, percent=percent, + recommended=recommended, size=size, + preexist=preexist, vgname=vgname, + bytesPerInode=bytesPerInode, + mountpoint=mountpoint) + self.encrypted = encrypted + self.passphrase = passphrase + + def _getArgsAsStr(self): + retval = FC3_LogVolData._getArgsAsStr(self) + + if self.encrypted: + retval += " --encrypted" + + if self.passphrase != "": + retval += " --passphrase=\"%s\"" % self.passphrase + + return retval + class F9_LogVolData(FC3_LogVolData): def __init__(self, fsopts="", fstype="", grow=False, maxSizeMB=0, name="", format=True, percent=0, @@ -189,6 +216,16 @@ class FC4_LogVol(FC3_LogVol): op.add_option("--fsoptions", dest="fsopts") return op +class RHEL5_LogVol(FC4_LogVol): + def __init__(self, writePriority=132, lvList=None): + FC4_LogVol.__init__(self, writePriority, lvList) + + def _getParser(self): + op = FC4_LogVol._getParser(self) + op.add_option("--encrypted", action="store_true", default=False) + op.add_option("--passphrase") + return op + class F9_LogVol(FC4_LogVol): def __init__(self, writePriority=132, lvList=None): FC4_LogVol.__init__(self, writePriority, lvList) diff --git a/pykickstart/commands/partition.py b/pykickstart/commands/partition.py index d30f919..403265f 100644 --- a/pykickstart/commands/partition.py +++ b/pykickstart/commands/partition.py @@ -111,6 +111,34 @@ class FC4_PartData(FC3_PartData): return retval +class RHEL5_PartData(FC4_PartData): + def __init__(self, active=False, primOnly=False, end=0, fsopts="", + fstype="", grow=False, label="", maxSizeMB=0, + format=True, onbiosdisk="", disk="", onPart="", + recommended=False, size=None, start=0, mountpoint="", + bytesPerInode=4096, encrypted=False, passphrase=""): + FC4_PartData.__init__(self, active=active, primOnly=primOnly, + end=end, fstype=fstype, grow=grow, + maxSizeMB=maxSizeMB, format=format, + onbiosdisk=onbiosdisk, disk=disk, + onPart=onPart, size=size, start=start, + recommended=recommended, + bytesPerInode=bytesPerInode, + mountpoint=mountpoint) + self.encrypted = encrypted + self.passphrase = passphrase + + def _getArgsAsStr(self): + retval = FC4_PartData._getArgsAsStr(self) + + if self.encrypted: + retval += " --encrypted" + + if self.passphrase != "": + retval += " --passphrase=\"%s\"" % self.passphrase + + return retval + class F9_PartData(FC4_PartData): def __init__(self, active=False, primOnly=False, fsprofile="", end=0, fsopts="", fstype="", grow=False, label="", @@ -229,6 +257,22 @@ class FC4_Partition(FC3_Partition): op.add_option("--label", dest="label") return op +class RHEL5_Partition(FC4_Partition): + def __init__(self, writePriority=130, partitions=None): + FC4_Partition.__init__(self, writePriority, partitions) + + def part_cb (option, opt_str, value, parser): + if value.startswith("/dev/"): + parser.values.ensure_value(option.dest, value[5:]) + else: + parser.values.ensure_value(option.dest, value) + + def _getParser(self): + op = FC4_Partition._getParser(self) + op.add_option("--encrypted", action="store_true", default=False) + op.add_option("--passphrase") + return op + class F9_Partition(FC4_Partition): def __init__(self, writePriority=130, partitions=None): FC4_Partition.__init__(self, writePriority, partitions) @@ -246,3 +290,4 @@ class F9_Partition(FC4_Partition): op.add_option("--encrypted", action="store_true", default=False) op.add_option("--passphrase") return op + diff --git a/pykickstart/commands/raid.py b/pykickstart/commands/raid.py index 2234ea7..6e49277 100644 --- a/pykickstart/commands/raid.py +++ b/pykickstart/commands/raid.py @@ -105,6 +105,31 @@ class FC5_RaidData(FC4_RaidData): return retval +class RHEL5_RaidData(FC5_RaidData): + def __init__(self, device=None, fsopts="", fstype="", level="", + format=True, spares=0, preexist=False, mountpoint="", + members=None, encrypted=False, passphrase="", + bytesPerInode=4096): + FC5_RaidData.__init__(self, device=device, fsopts=fsopts, + fstype=fstype, level=level, + format=format, spares=spares, + preexist=preexist, + bytesPerInode=bytesPerInode, + mountpoint=mountpoint, members=members) + self.encrypted = encrypted + self.passphrase = passphrase + + def _getArgsAsStr(self): + retval = FC5_RaidData._getArgsAsStr(self) + + if self.encrypted: + retval += " --encrypted" + + if self.passphrase != "": + retval += " --passphrase=\"%s\"" % self.passphrase + + return retval + F7_RaidData = FC5_RaidData class F9_RaidData(FC5_RaidData): @@ -227,6 +252,16 @@ class FC5_Raid(FC4_Raid): type="int", nargs=1) return op +class RHEL5_Raid(FC5_Raid): + def __init__(self, writePriority=131, raidList=None): + FC5_Raid.__init__(self, writePriority, raidList) + + def _getParser(self): + op = FC5_Raid._getParser(self) + op.add_option("--encrypted", action="store_true", default=False) + op.add_option("--passphrase") + return op + class F7_Raid(FC5_Raid): def __init__(self, writePriority=131, raidList=None): FC5_Raid.__init__(self, writePriority, raidList) diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index e1b3dd3..c4fde9e 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -571,7 +571,7 @@ commandMap = { RHEL5: { "auth": authconfig.FC3_Authconfig, "authconfig": authconfig.FC3_Authconfig, - "autopart": autopart.FC3_AutoPart, + "autopart": autopart.FC9_AutoPart, "autostep": autostep.FC3_AutoStep, "bootloader": bootloader.FC4_Bootloader, "cdrom": method.FC6_Method, @@ -596,7 +596,7 @@ commandMap = { "lang": lang.FC3_Lang, "langsupport": langsupport.FC5_LangSupport, "logging": logging.FC6_Logging, - "logvol": logvol.FC4_LogVol, + "logvol": logvol.RHEL5_LogVol, "mediacheck": mediacheck.FC4_MediaCheck, "monitor": monitor.FC6_Monitor, "mouse": mouse.FC3_Mouse, @@ -604,9 +604,9 @@ commandMap = { "network": network.RHEL5_Network, "nfs": method.FC6_Method, "part": partition.FC4_Partition, - "partition": partition.FC4_Partition, + "partition": partition.RHEL5_Partition, "poweroff": reboot.FC6_Reboot, - "raid": raid.FC5_Raid, + "raid": raid.RHEL5_Raid, "reboot": reboot.FC6_Reboot, "repo": repo.FC6_Repo, "rootpw": rootpw.FC3_RootPw,