Skip to content

Commit

Permalink
Add support for Fedora 20
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette committed Dec 17, 2013
1 parent bf58aec commit 02652ef
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 4 deletions.
8 changes: 4 additions & 4 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, and 19 installation.
Class for Fedora 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, and 20 installation.
"""
def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,
brokenisomethod, output_disk=None, macaddress=None):
Expand All @@ -48,7 +48,7 @@ def _modify_iso(self):
"""
self._copy_kickstart(os.path.join(self.iso_contents, "ks.cfg"))

if self.tdl.update in ["17", "18", "19"]:
if self.tdl.update in ["17", "18", "19", "20"]:
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 @@ -93,7 +93,7 @@ def get_class(tdl, config, auto, output_disk=None, netdev=None, diskbus=None,
Factory method for Fedora installs.
"""
if tdl.update in ["10", "11", "12", "13", "14", "15", "16", "17", "18",
"19"]:
"19", "20"]:
if netdev is None:
netdev = 'virtio'
if diskbus is None:
Expand All @@ -108,4 +108,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"
return "Fedora: 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20"
32 changes: 32 additions & 0 deletions oz/auto/Fedora20.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
text

auth --enableshadow --passalgo=sha512

# Use CDROM installation media
cdrom
# Run the Setup Agent on first boot
ignoredisk --only-use=vda
# Keyboard layouts
keyboard --vckeymap=us --xlayouts='us'
# System language
lang en_US.UTF-8

# Network information
network --bootproto=dhcp --device=eth0 --ipv6=auto --activate
network --hostname=localhost.localdomain
# Root password
rootpw %ROOTPW%
# System timezone
timezone America/New_York --isUtc
# System bootloader configuration
bootloader --location=mbr --boot-drive=vda
autopart --type=lvm
# Partition clearing information
clearpart --none --initlabel

reboot

%packages
@core

%end

0 comments on commit 02652ef

Please sign in to comment.