From 53ef72b73487ecdfae057bdb2d2c559ed75d77fd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 6 Nov 2019 11:58:18 -0800 Subject: [PATCH] Drop some old release-based workarounds, no longer needed Signed-off-by: Adam Williamson --- createhdds.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/createhdds.py b/createhdds.py index 9fe9bf7..b8c238e 100755 --- a/createhdds.py +++ b/createhdds.py @@ -263,10 +263,8 @@ class VirtInstallImage(object): if arch in ['ppc64','ppc64le']: fedoradir = 'fedora-secondary' memsize = '4096' - if arch == 'aarch64' and str(self.release).isdigit() and int(self.release) < 28: - fedoradir = 'fedora-secondary' - if arch == 'i386' and (str(self.release).lower() == 'rawhide' or int(self.release) > 25): - # from F26 onwards, i686 is in fedora-secondary + if arch == 'i386': + # i686 is in fedora-secondary (until it died) fedoradir = 'fedora-secondary' variant = self.variant @@ -285,11 +283,7 @@ class VirtInstallImage(object): # branched loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{1}/{2}/{3}/os/" else: - # sigh i hate life - 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/" + loctmp = "https://download.fedoraproject.org/pub/{0}/releases/{1}/{2}/{3}/os/" xargs = "inst.ks=file:/{0}.ks".format(self.name) args = ["virt-install", "--disk", "size={0},path={1}".format(self.size, tmpfile), "--os-variant", shortid, "-x", xargs, "--initrd-inject",