Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
grub2: Disable use of grub-mkconfig on Endless
OSTree recently gained support[1] for recognizing the Debian-style /boot/grub/grub.cfg path in addition to the existing support for the Red Hat-style /boot/grub2/grub.cfg. With this, it decides to run grub-mkconfig in ostree_sysroot_write_deployment_with_options() by calling ostree_bootloader_write_config(). However grub-mkconfig is disabled on Endless OS since the grub.cfg is hand-written and doesn't need updates[2] and therefore returns a non-zero exit status. This causes operations such as "ostree admin unlock --hotfix" and "ostree admin upgrade" to fail. So this commit effectively reverts the Debian grub support, by making _ostree_bootloader_grub2_query() always return TRUE with out_is_active set to FALSE, so that grub-mkconfig is not called and the operations above succeed. In the longer term, Endless should migrate to letting OSTree manage the grub config and drop this patch[3][4]. https://phabricator.endlessm.com/T25195 [1] ostreedev/ostree@74bdf7e17 [2] https://phabricator.endlessm.com/T19614 [3] https://phabricator.endlessm.com/T14870 [4] https://phabricator.endlessm.com/T18848
- Loading branch information