From 957876ae4138054cc8c49f3dbd7b593ca3d151e5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 23 Jul 2020 12:58:44 +0000 Subject: [PATCH] rpmostreepayload: Set bootloader=none This matches https://github.com/coreos/coreos-assembler/commit/311768c2b14775f4ad18dad05a9e4dfd2e6387b6 Since we're doing a new install, we're going to be installing an updated bootloader (e.g. GRUB2) which should parse the BLS fragments that OSTree generates. There's no reason for ostree to rerun `grub2-mkconfig`. --- pyanaconda/payload/rpmostreepayload.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyanaconda/payload/rpmostreepayload.py b/pyanaconda/payload/rpmostreepayload.py index 91f8e7cb6901..f95d892de6a9 100644 --- a/pyanaconda/payload/rpmostreepayload.py +++ b/pyanaconda/payload/rpmostreepayload.py @@ -184,6 +184,12 @@ def _install(self): # We don't support resuming from interrupted installs repo.set_disable_fsync(True) + # See https://github.com/coreos/coreos-assembler/commit/311768c2b14775f4ad18dad05a9e4dfd2e6387b6 + # Tells OSTree to trust the bootloader (e.g. grub2) to read the BLS configs it generates + repoconf = repo.get_config() + repoconf.set_string("sysroot", "bootloader", "none") + repo.write_config(repoconf) + self._remoteOptions = {} if hasattr(ostreesetup, 'nogpg') and ostreesetup.nogpg: