Skip to content

Commit

Permalink
rpmostreepayload: Set bootloader=none
Browse files Browse the repository at this point in the history
This matches
coreos/coreos-assembler@311768c

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`.
  • Loading branch information
cgwalters committed Jul 23, 2020
1 parent 5444be2 commit 957876a
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pyanaconda/payload/rpmostreepayload.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 957876a

Please sign in to comment.