QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: add smt=off xen option during installation

Browse Source 
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 938578c2b2)
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-11 05:15:22 +02:00
parent c030eba49a
commit 4e74523491
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
anaconda/pyanaconda/bootloader.py
View File

@ -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,