testing/createhdds
11
0
Fork 0
mirror of https://github.com/rocky-linux/createhdds.git synced 2024-12-22 10:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop some old release-based workarounds, no longer needed

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-11-06 11:58:18 -08:00
parent c9da58b0b0
commit 53ef72b734
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
createhdds.py
View File

@ -263,10 +263,8 @@ class VirtInstallImage(object):
if arch in ['ppc64','ppc64le']: if arch in ['ppc64','ppc64le']:
fedoradir = 'fedora-secondary' fedoradir = 'fedora-secondary'
memsize = '4096' memsize = '4096'
if arch == 'aarch64' and str(self.release).isdigit() and int(self.release) < 28: if arch == 'i386':
fedoradir = 'fedora-secondary' # i686 is in fedora-secondary (until it died)
if arch == 'i386' and (str(self.release).lower() == 'rawhide' or int(self.release) > 25):
# from F26 onwards, i686 is in fedora-secondary
fedoradir = 'fedora-secondary' fedoradir = 'fedora-secondary'
variant = self.variant variant = self.variant
@ -285,11 +283,7 @@ class VirtInstallImage(object):
# branched # branched
loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{1}/{2}/{3}/os/" loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{1}/{2}/{3}/os/"
else: else:
# sigh i hate life loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/"
if int(self.release) < 28:
loctmp = "https://archives.fedoraproject.org/pub/archive/{0}/releases/{1}/{2}/{3}/os/"
else:
loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/"
xargs = "inst.ks=file:/{0}.ks".format(self.name) xargs = "inst.ks=file:/{0}.ks".format(self.name)
args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile), args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile),
"--os-variant", shortid, "-x", xargs, "--initrd-inject", "--os-variant", shortid, "-x", xargs, "--initrd-inject",