Skip to content

Commit

Permalink
Add Fedora 41 support
Browse files Browse the repository at this point in the history
  • Loading branch information
bcl committed Apr 2, 2024
1 parent 4a2896a commit 41f0b60
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 3 deletions.
125 changes: 125 additions & 0 deletions pykickstart/handlers/f41.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
#
# Copyright 2024 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.
#
__all__ = ["F41Handler"]

from pykickstart import commands
from pykickstart.base import BaseHandler
from pykickstart.version import F41

class F41Handler(BaseHandler):
version = F41

commandMap = {
"auth": commands.authconfig.F35_Authconfig, # RemovedCommand
"authconfig": commands.authconfig.F35_Authconfig, # RemovedCommand
"authselect": commands.authselect.F28_Authselect,
"autopart": commands.autopart.F38_AutoPart,
"autostep": commands.autostep.F40_Autostep, # RemovedCommand
"bootloader": commands.bootloader.F39_Bootloader,
"btrfs": commands.btrfs.F23_BTRFS,
"cdrom": commands.cdrom.FC3_Cdrom,
"clearpart": commands.clearpart.F28_ClearPart,
"cmdline": commands.displaymode.F26_DisplayMode,
"device": commands.device.F34_Device,
"deviceprobe": commands.deviceprobe.F34_DeviceProbe,
"dmraid": commands.dmraid.F34_DmRaid,
"driverdisk": commands.driverdisk.F14_DriverDisk,
"module": commands.module.F31_Module,
"eula": commands.eula.F20_Eula,
"fcoe": commands.fcoe.F28_Fcoe,
"firewall": commands.firewall.F28_Firewall,
"firstboot": commands.firstboot.FC3_Firstboot,
"graphical": commands.displaymode.F26_DisplayMode,
"group": commands.group.F12_Group,
"halt": commands.reboot.F23_Reboot,
"harddrive": commands.harddrive.F33_HardDrive,
"hmc": commands.hmc.F28_Hmc,
"ignoredisk": commands.ignoredisk.F34_IgnoreDisk,
"install": commands.install.F34_Install,
"iscsi": commands.iscsi.F17_Iscsi,
"iscsiname": commands.iscsiname.FC6_IscsiName,
"keyboard": commands.keyboard.F18_Keyboard,
"lang": commands.lang.F19_Lang,
"liveimg": commands.liveimg.F19_Liveimg,
"logging": commands.logging.F40_Logging,
"logvol": commands.logvol.F29_LogVol,
"mediacheck": commands.mediacheck.FC4_MediaCheck,
"method": commands.method.F40_Method, # RemovedCommand
"mount": commands.mount.F27_Mount,
"multipath": commands.multipath.F34_MultiPath,
"network": commands.network.F39_Network,
"nfs": commands.nfs.FC6_NFS,
"nvdimm": commands.nvdimm.F40_Nvdimm,
"timesource": commands.timesource.F33_Timesource,
"ostreecontainer": commands.ostreecontainer.F38_OSTreeContainer,
"ostreesetup": commands.ostreesetup.F38_OSTreeSetup,
"part": commands.partition.F34_Partition,
"partition": commands.partition.F34_Partition,
"poweroff": commands.reboot.F23_Reboot,
"raid": commands.raid.F29_Raid,
"realm": commands.realm.F19_Realm,
"reboot": commands.reboot.F23_Reboot,
"repo": commands.repo.F40_Repo,
"reqpart": commands.reqpart.F23_ReqPart,
"rescue": commands.rescue.F10_Rescue,
"rootpw": commands.rootpw.F37_RootPw,
"selinux": commands.selinux.FC3_SELinux,
"services": commands.services.FC6_Services,
"shutdown": commands.reboot.F23_Reboot,
"skipx": commands.skipx.FC3_SkipX,
"snapshot": commands.snapshot.F26_Snapshot,
"sshpw": commands.sshpw.F24_SshPw,
"sshkey": commands.sshkey.F22_SshKey,
"text": commands.displaymode.F26_DisplayMode,
"timezone": commands.timezone.F40_Timezone,
"updates": commands.updates.F34_Updates,
"url": commands.url.F30_Url,
"user": commands.user.F24_User,
"vnc": commands.vnc.F9_Vnc,
"volgroup": commands.volgroup.F21_VolGroup,
"xconfig": commands.xconfig.F14_XConfig,
"zerombr": commands.zerombr.F9_ZeroMbr,
"zfcp": commands.zfcp.F37_ZFCP,
"zipl": commands.zipl.F32_Zipl,
}

dataMap = {
"BTRFSData": commands.btrfs.F23_BTRFSData,
"DriverDiskData": commands.driverdisk.F14_DriverDiskData,
"DeviceData": commands.device.F8_DeviceData,
"DmRaidData": commands.dmraid.FC6_DmRaidData,
"ModuleData": commands.module.F31_ModuleData,
"TimesourceData": commands.timesource.F33_TimesourceData,
"FcoeData": commands.fcoe.F28_FcoeData,
"GroupData": commands.group.F12_GroupData,
"IscsiData": commands.iscsi.F17_IscsiData,
"LogVolData": commands.logvol.F29_LogVolData,
"MountData": commands.mount.F27_MountData,
"MultiPathData": commands.multipath.FC6_MultiPathData,
"NetworkData": commands.network.F39_NetworkData,
"NvdimmData": commands.nvdimm.F28_NvdimmData,
"PartData": commands.partition.F29_PartData,
"RaidData": commands.raid.F29_RaidData,
"RepoData": commands.repo.F30_RepoData,
"SnapshotData": commands.snapshot.F26_SnapshotData,
"SshPwData": commands.sshpw.F24_SshPwData,
"SshKeyData": commands.sshkey.F38_SshKeyData,
"UserData": commands.user.F19_UserData,
"VolGroupData": commands.volgroup.F21_VolGroupData,
"ZFCPData": commands.zfcp.F37_ZFCPData,
}
5 changes: 3 additions & 2 deletions pykickstart/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,10 @@
F39 = 39000
F40 = 40000
RHEL10 = 40100
F41 = 41000

# This always points at the latest version and is the default.
DEVEL = F40
DEVEL = F41

# A one-to-one mapping from string representations to version numbers.
versionMap = {
Expand All @@ -115,7 +116,7 @@
"F24": F24, "F25": F25, "F26": F26, "F27": F27, "F28": F28,
"F29": F29, "F30": F30, "F31": F31, "F32": F32, "F33": F33,
"F34": F34, "F35": F35, "F36": F36, "F37": F37, "F38": F38,
"F39": F39, "F40": F40,
"F39": F39, "F40": F40, "F41": F41,
"RHEL3": RHEL3, "RHEL4": RHEL4, "RHEL5": RHEL5, "RHEL6": RHEL6,
"RHEL7": RHEL7, "RHEL8": RHEL8, "RHEL9": RHEL9, "RHEL10": RHEL10,
}
Expand Down
6 changes: 5 additions & 1 deletion tests/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ def runTest(self):
# pass - F40
self.assertEqual(stringToVersion("Fedora 40"), F40)
self.assertEqual(stringToVersion("F40"), F40)
# pass - F41
self.assertEqual(stringToVersion("Fedora 41"), F41)
self.assertEqual(stringToVersion("F41"), F41)

# pass - RHEL3
self.assertEqual(stringToVersion("Red Hat Enterprise Linux 3"), RHEL3)
Expand Down Expand Up @@ -277,7 +280,8 @@ def runTest(self):
self.assertEqual(versionToString(F38, skipDevel=True), "F38")
self.assertEqual(versionToString(F39, skipDevel=True), "F39")
self.assertEqual(versionToString(F40, skipDevel=True), "F40")
self.assertEqual(versionToString(F40, skipDevel=False), "DEVEL")
self.assertEqual(versionToString(F41, skipDevel=True), "F41")
self.assertEqual(versionToString(F41, skipDevel=False), "DEVEL")
# RHEL series
self.assertEqual(versionToString(RHEL3), "RHEL3")
self.assertEqual(versionToString(RHEL4), "RHEL4")
Expand Down

0 comments on commit 41f0b60

Please sign in to comment.