mirror of
https://pagure.io/fedora-qa/createhdds.git
synced 2024-11-24 16:03:07 +00:00
Bit more rejigging, fix i386 secondary case
Broke the i386 secondary case with the previous rejig (by moving where we fix i686 to be i386). This fixes that and again makes readability better.
This commit is contained in:
parent
7e5db6a426
commit
d87bafb15e
@ -250,15 +250,16 @@ class VirtInstallImage(object):
|
|||||||
|
|
||||||
tmpfile = "{0}.tmp".format(self.filename)
|
tmpfile = "{0}.tmp".format(self.filename)
|
||||||
arch = self.arch
|
arch = self.arch
|
||||||
fedoradir = ''
|
fedoradir = 'fedora/linux'
|
||||||
|
memsize = '2048'
|
||||||
if arch == 'i686':
|
if arch == 'i686':
|
||||||
arch = 'i386'
|
arch = 'i386'
|
||||||
if arch in ['ppc64','ppc64le']:
|
if arch in ['ppc64','ppc64le']:
|
||||||
fedoradir = 'fedora-secondary'
|
fedoradir = 'fedora-secondary'
|
||||||
memsize = '4096'
|
memsize = '4096'
|
||||||
else:
|
if arch == 'i386' and (self.release.lower() == 'rawhide' or int(self.release) > 25):
|
||||||
fedoradir = 'fedora/linux'
|
# from F26 onwards, i686 is in fedora-secondary
|
||||||
memsize = '2048'
|
fedoradir = 'fedora-secondary'
|
||||||
|
|
||||||
variant = self.variant
|
variant = self.variant
|
||||||
# For F26, the installer images in the Workstation tree seem to be
|
# For F26, the installer images in the Workstation tree seem to be
|
||||||
@ -278,9 +279,6 @@ class VirtInstallImage(object):
|
|||||||
loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{0}/{1}/{2}/os/"
|
loctmp = "https://dl.fedoraproject.org/pub/{0}/development/{0}/{1}/{2}/os/"
|
||||||
else:
|
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/"
|
||||||
if arch == 'i686' and int(self.release) > 25:
|
|
||||||
# from F26 onwards, i686 is in fedora-secondary
|
|
||||||
fedoradir = 'fedora-secondary'
|
|
||||||
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",
|
||||||
|
Loading…
Reference in New Issue
Block a user