summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2012-10-15 11:52:56 -0400
committerPeter Jones <pjones@redhat.com>2012-10-15 15:24:42 -0400
commitc308c8978e2d27fcc4f9c6591395f68f26ac9185 (patch)
tree0287387ba8241f8296ecd3bbcf54287cf8b4b048
parente875a5aaaf74c32b1e0938e465a02a4ed123e4d7 (diff)
downloadanaconda-c308c8978e2d27fcc4f9c6591395f68f26ac9185.tar.gz
anaconda-c308c8978e2d27fcc4f9c6591395f68f26ac9185.tar.xz
anaconda-c308c8978e2d27fcc4f9c6591395f68f26ac9185.zip
Configure new-kernel-pkg to keep tboot configuration on updates (#742885)
If we want tboot to keep getting used, we need to configure new-kernel-pkg to tell grubby to do that. When grubby finds a multiboot stanza as the default template, it won't use the multiboot parts of the template unless specifically configured to. This patch adds a configuration option to tell grubby that we always want to use the tboot multiboot kernel by default when we add a new kernel. Signed-off-by: Peter Jones <pjones@redhat.com>
-rw-r--r--pyanaconda/bootloader.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index a8c969e51..58c3690e7 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2140,6 +2140,10 @@ def writeSysconfigKernel(storage, version):
f.write("\n")
f.write("# DEFAULTKERNEL specifies the default kernel package type\n")
f.write("DEFAULTKERNEL=%s\n" % kernel)
+ if anaconda.id.bootloader.trusted_boot:
+ f.write("# HYPERVISOR specifies the default multiboot kernel\n")
+ f.write("HYPERVISOR=/boot/tboot.gz\n")
+ f.write("HYPERVISOR_ARGS=logging=vga,serial,memory\n")
f.close()
def writeBootLoader(storage, payload, instClass):