srbala/createhdds
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/createhdds.git synced 2024-11-25 16:13:09 +00:00
Code Issues Releases Activity

Different fix for F26 Workstation: use Everything tree

Browse Source 
It seems like the installer images (in os/images) for the F26
Workstation tree somehow come from the OStree installer compose
rather than the network installer compose; install.img and
boot.iso are far larger than they should be, and match the size
of the OStree installer .iso . So instead of using those images
and bumping up the memory size to 4GiB, use the Everything tree
for F26 Workstation image builds and go back to 2GiB.
This commit is contained in:
Adam Williamson 2017-07-20 11:56:25 -07:00
parent f476e00bd6
commit 6d997b2f80
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
createhdds.py
View File

@ -247,11 +247,17 @@ class VirtInstallImage(object):
if arch == 'i686': if arch == 'i686':
arch = 'i386' arch = 'i386'
xargs = "inst.ks=file:/{0}.ks".format(self.name) xargs = "inst.ks=file:/{0}.ks".format(self.name)
variant = self.variant
# For F26, the installer images in the Workstation tree seem to be
# the OStree installer (they're much bigger than they should be),
# so use Everything instead of Workstation for F26
if int(self.release) == 26 and variant == "Workstation":
variant = "Everything"
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",
"{0}/{1}.ks".format(SCRIPTDIR, self.name), "--location", "{0}/{1}.ks".format(SCRIPTDIR, self.name), "--location",
loctmp.format(str(self.release), self.variant, arch), "--name", "createhdds", loctmp.format(str(self.release), variant, arch), "--name", "createhdds",
"--memory", "4096", "--noreboot", "--wait", "-1"] "--memory", "2048", "--noreboot", "--wait", "-1"]
if textinst: if textinst:
args.extend(("--graphics", "none", "--extra-args", "console=ttyS0")) args.extend(("--graphics", "none", "--extra-args", "console=ttyS0"))
else: else: