From 6d997b2f807352e119cd3bd68cc2c02fc3f32dde Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 20 Jul 2017 11:56:25 -0700 Subject: [PATCH] Different fix for F26 Workstation: use Everything tree 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. --- createhdds.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/createhdds.py b/createhdds.py index 2d7eeec..56d7981 100755 --- a/createhdds.py +++ b/createhdds.py @@ -247,11 +247,17 @@ class VirtInstallImage(object): if arch == 'i686': arch = 'i386' 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), "--os-variant", shortid, "-x", xargs, "--initrd-inject", "{0}/{1}.ks".format(SCRIPTDIR, self.name), "--location", - loctmp.format(str(self.release), self.variant, arch), "--name", "createhdds", - "--memory", "4096", "--noreboot", "--wait", "-1"] + loctmp.format(str(self.release), variant, arch), "--name", "createhdds", + "--memory", "2048", "--noreboot", "--wait", "-1"] if textinst: args.extend(("--graphics", "none", "--extra-args", "console=ttyS0")) else: