Skip to content

Commit

Permalink
Add in Fedora 26 support.
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette committed Aug 8, 2017
1 parent b3c4a04 commit f43f64e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
12 changes: 6 additions & 6 deletions oz/Fedora.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

class FedoraGuest(oz.RedHat.RedHatLinuxCDYumGuest):
"""
Class for Fedora 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, and 25 installation.
Class for Fedora 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, and 26 installation.
"""
def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,
brokenisomethod, output_disk=None, macaddress=None,
Expand All @@ -40,7 +40,7 @@ def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,
# Prior to Fedora-22, we use yum; on F-22 and later, we use dnf.
# Express that preference here.
use_yum = True
if tdl.update in ["22", "23", "24", "25"]:
if tdl.update in ["22", "23", "24", "25", "26"]:
use_yum = False
oz.RedHat.RedHatLinuxCDYumGuest.__init__(self, tdl, config, auto,
output_disk, nicmodel, diskbus,
Expand All @@ -53,7 +53,7 @@ def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,
self.haverepo = haverepo
self.brokenisomethod = brokenisomethod
if self.tdl.update in ["14", "15", "16", "17", "18", "19", "20", "21",
"22", "23", "24", "25"]:
"22", "23", "24", "25", "26"]:
self.virtio_channel_name = 'org.fedoraproject.anaconda.log.0'

def _modify_iso(self):
Expand All @@ -62,7 +62,7 @@ def _modify_iso(self):
"""
self._copy_kickstart(os.path.join(self.iso_contents, "ks.cfg"))

if self.tdl.update in ["17", "18", "19", "20", "21", "22", "23", "24", "25"]:
if self.tdl.update in ["17", "18", "19", "20", "21", "22", "23", "24", "25", "26"]:
initrdline = " append initrd=initrd.img ks=cdrom:/dev/cdrom:/ks.cfg"
else:
initrdline = " append initrd=initrd.img ks=cdrom:/ks.cfg"
Expand Down Expand Up @@ -121,7 +121,7 @@ def get_class(tdl, config, auto, output_disk=None, netdev=None, diskbus=None,
# The newer_distros list is actually a list of distros that have similar
# installation requirements. Thus, even if the particular distro isn't
# supported anymore, it should not be removed from the list.
newer_distros = ["19", "20", "21", "22", "23", "24", "25"]
newer_distros = ["19", "20", "21", "22", "23", "24", "25", "26"]

if tdl.update == 'rawhide' or int(tdl.update) > int(newer_distros[-1]):
if netdev is None:
Expand Down Expand Up @@ -163,4 +163,4 @@ def get_supported_string():
"""
Return supported versions as a string.
"""
return "Fedora: 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25"
return "Fedora: 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26"
23 changes: 23 additions & 0 deletions oz/auto/Fedora26.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
install
text
keyboard us
lang en_US.UTF-8
skipx
network --device ens3 --bootproto dhcp
rootpw %ROOTPW%
firewall --disabled
authconfig --enableshadow --enablemd5
selinux --enforcing
timezone --utc America/New_York
bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"

zerombr
clearpart --all --initlabel
autopart --type=lvm

reboot

%packages
@core

%end

0 comments on commit f43f64e

Please sign in to comment.