On Tue, 2013-06-04 at 15:33 -0400, Chris Lumens wrote:
---
pykickstart/handlers/control.py | 43 ++++++++++++++++++++++-------------------
pykickstart/version.py | 4 ++--
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index de71643..915c687 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -1227,15 +1227,16 @@ commandMap = {
"zfcp": zfcp.F12_ZFCP,
},
- # based on f17ish (kinda, sorta)
+ # based on f19
RHEL7: {
"auth": authconfig.FC3_Authconfig,
"authconfig": authconfig.FC3_Authconfig,
- "autopart": autopart.F16_AutoPart,
+ "autopart": autopart.F18_AutoPart,
"autostep": autostep.FC3_AutoStep,
- "bootloader": bootloader.F17_Bootloader,
+ "bootloader": bootloader.F19_Bootloader,
+ "btrfs": btrfs.F17_BTRFS,
"cdrom": method.F19_Method,
- "clearpart": clearpart.FC3_ClearPart,
+ "clearpart": clearpart.F17_ClearPart,
"cmdline": displaymode.FC3_DisplayMode,
"device": device.F8_Device,
"deviceprobe": deviceprobe.FC3_DeviceProbe,
@@ -1246,36 +1247,37 @@ commandMap = {
"firstboot": firstboot.FC3_Firstboot,
"graphical": displaymode.FC3_DisplayMode,
"group": group.F12_Group,
- "halt": reboot.FC6_Reboot,
+ "halt": reboot.F18_Reboot,
"harddrive": method.F19_Method,
"ignoredisk": ignoredisk.F14_IgnoreDisk,
"install": upgrade.F11_Upgrade,
- "iscsi": iscsi.F10_Iscsi,
+ "iscsi": iscsi.F17_Iscsi,
"iscsiname": iscsiname.FC6_IscsiName,
- "keyboard": keyboard.FC3_Keyboard,
- "lang": lang.FC3_Lang,
+ "keyboard": keyboard.F18_Keyboard,
+ "lang": lang.F19_Lang,
"liveimg": method.F19_Method,
"logging": logging.FC6_Logging,
- "logvol": logvol.F15_LogVol,
+ "logvol": logvol.F18_LogVol,
"mediacheck": mediacheck.FC4_MediaCheck,
"multipath": multipath.FC6_MultiPath,
"network": network.F19_Network,
"nfs": method.F19_Method,
- "part": partition.F14_Partition,
- "partition": partition.F14_Partition,
- "poweroff": reboot.FC6_Reboot,
- "raid": raid.F15_Raid,
- "reboot": reboot.FC6_Reboot,
+ "part": partition.F18_Partition,
+ "partition": partition.F18_Partition,
+ "poweroff": reboot.F18_Reboot,
+ "raid": raid.F18_Raid,
+ "realm": realm.F19_Realm,
+ "reboot": reboot.F18_Reboot,
"repo": repo.F15_Repo,
"rescue": rescue.F10_Rescue,
"rootpw": rootpw.F18_RootPw,
"selinux": selinux.FC3_SELinux,
"services": services.FC6_Services,
- "shutdown": reboot.FC6_Reboot,
+ "shutdown": reboot.F18_Reboot,
"skipx": skipx.FC3_SkipX,
"sshpw": sshpw.F13_SshPw,
"text": displaymode.FC3_DisplayMode,
- "timezone": timezone.FC6_Timezone,
+ "timezone": timezone.F18_Timezone,
"unsupported_hardware":
unsupported_hardware.RHEL6_UnsupportedHardware,
"updates": updates.F7_Updates,
"upgrade": upgrade.F11_Upgrade,
@@ -1607,17 +1609,18 @@ dataMap = {
"ZFCPData": zfcp.F12_ZFCPData,
},
RHEL7: {
+ "BTRFSData": btrfs.F17_BTRFSData,
"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,
+ "IscsiData": iscsi.F17_IscsiData,
+ "LogVolData": logvol.F18_LogVolData,
"MultiPathData": multipath.FC6_MultiPathData,
"NetworkData": network.F19_NetworkData,
- "PartData": partition.F14_PartData,
- "RaidData": raid.F15_RaidData,
+ "PartData": partition.F18_PartData,
+ "RaidData": raid.F18_RaidData,
"RepoData": repo.F15_RepoData,
"SshPwData": sshpw.F13_SshPwData,
"UserData": user.F19_UserData,
diff --git a/pykickstart/version.py b/pykickstart/version.py
index afaedc4..161fe2f 100644
--- a/pykickstart/version.py
+++ b/pykickstart/version.py
@@ -1,7 +1,7 @@
#
# Chris Lumens <clumens(a)redhat.com>
#
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Red Hat, Inc.
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 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
@@ -73,7 +73,7 @@ F16 = 14000
F17 = 15000
F18 = 16000
F19 = 17000
-RHEL7 = 15100
+RHEL7 = 17100
# This always points at the latest version and is the default.
DEVEL = F19
ACK.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic