Hack to avoid F33 KDE image using Wayland (#1960458)

This is a bit ugly but offhand can't think of a better way. We
are dropping plasma-workspace-wayland from the F33 KDE image to
try and avoid it using Plasma-on-Wayland as the default session,
which is #1960458.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-05-13 16:22:24 -07:00
parent 8727e37d0f
commit fe87f40d94
2 changed files with 40 additions and 2 deletions

View File

@ -292,10 +292,17 @@ class VirtInstallImage(object):
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:
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) ksfile = "{0}.ks".format(self.name)
if str(self.release) == "33" and self.name == "kde":
# FIXME: icky hack for https://bugzilla.redhat.com/show_bug.cgi?id=1960458
# would be good to improve this, otherwise drop it when F33 is EOL
ksfile = "{0}-{1}.ks".format(self.name, str(self.release))
xargs = "inst.ks=file:/{0}".format(ksfile)
if str(self.release) == "33" and self.name == "kde":
xargs = "inst.ks=file:/{0}-{1}.ks".format(self.name, str(self.release))
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}".format(SCRIPTDIR, ksfile), "--location",
loctmp.format(fedoradir, str(self.release), variant, arch), "--name", "createhdds", loctmp.format(fedoradir, str(self.release), variant, arch), "--name", "createhdds",
"--memory", memsize, "--noreboot", "--wait", "-1"] "--memory", memsize, "--noreboot", "--wait", "-1"]
if logger.getEffectiveLevel() == logging.DEBUG: if logger.getEffectiveLevel() == logging.DEBUG:

31
kde-33.ks Normal file
View File

@ -0,0 +1,31 @@
bootloader --location=mbr
network --bootproto=dhcp
url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
lang en_US.UTF-8
keyboard us
timezone --utc America/New_York
clearpart --all
autopart
rootpw --plaintext weakpassword
user --name=test --password=weakpassword --plaintext
poweroff
%packages
@^kde-desktop-environment
# these are all in the KDE live image, we want to match that as it's
# the most common KDE deployment method
@firefox
@kde-apps
@kde-media
@kde-office
@networkmanager-submodules
fedora-release-kde
falkon
# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1960458
-plasma-workspace-wayland
imsettings-qt
-initial-setup
-initial-setup-gui
%end