From 4e74523491b574d2e1915c3b4bf1398597433011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 11 Sep 2018 05:15:22 +0200 Subject: [PATCH] anaconda: add smt=off xen option during installation Defaults set during package installation do not apply, as booloader configuration doesn't exist at that stage yet. Reported by @rustybird QubesOS/qubes-issues#4252 (cherry picked from commit 938578c2b2c655f7fb2e683b0880be71f297675c) --- anaconda/pyanaconda/bootloader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index adc2e4b..03b98e2 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -1505,7 +1505,7 @@ class GRUB2(GRUB): # boot arguments log.info("bootloader.py: used boot args: %s ", self.boot_args) defaults.write("GRUB_CMDLINE_LINUX=\"%s\"\n" % self.boot_args) - defaults.write("GRUB_CMDLINE_XEN_DEFAULT=\"console=none dom0_mem=min:1024M dom0_mem=max:4096M ucode=scan\"\n") + defaults.write("GRUB_CMDLINE_XEN_DEFAULT=\"console=none dom0_mem=min:1024M dom0_mem=max:4096M ucode=scan smt=off\"\n") defaults.write("GRUB_DISABLE_RECOVERY=\"true\"\n") defaults.write("GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"\n") defaults.write("GRUB_DISABLE_OS_PROBER=\"true\"\n") @@ -1859,7 +1859,7 @@ class XenEFI(EFIGRUB): root_args += " rootflags=subvol=%s" % image.device.name config.write("\n") config.write("[{}]\n".format(image.version)) - config.write("options=loglvl=all dom0_mem=min:1024M dom0_mem=max:4096M ucode=scan\n") + config.write("options=loglvl=all dom0_mem=min:1024M dom0_mem=max:4096M ucode=scan smt=off\n") config.write("kernel={} {} {}\n".format( image.kernel, root_args,