Skip to content

Commit

Permalink
Enable sysroot.bootprefix by default
Browse files Browse the repository at this point in the history
I've been testing this in various places and not seen any fallout,
so let's finally enable this by default and have the situation where
`/boot` is on the root `/` filesystem work out of the box.
  • Loading branch information
cgwalters committed Feb 5, 2024
1 parent 7404131 commit f002f92
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libostree/ostree-repo.c
Original file line number Diff line number Diff line change
Expand Up @@ -3346,7 +3346,7 @@ reload_sysroot_config (OstreeRepo *self, GCancellable *cancellable, GError **err
g_hash_table_replace (self->bls_append_values, key, value);
}

if (!ot_keyfile_get_boolean_with_default (self->config, "sysroot", "bootprefix", FALSE,
if (!ot_keyfile_get_boolean_with_default (self->config, "sysroot", "bootprefix", TRUE,
&self->enable_bootprefix, error))
return FALSE;

Expand Down
2 changes: 1 addition & 1 deletion tests/test-admin-deploy-bootprefix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -euo pipefail
setup_os_repository "archive" "syslinux"

${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmain/x86_64-runtime
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo config set sysroot.bootprefix 'true'
# sysroot.bootprefix is on by default now
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=root --os=testos testos:testos/buildmain/x86_64-runtime
assert_file_has_content_literal sysroot/boot/loader/entries/ostree-1-testos.conf 'linux /boot/ostree/testos-'
assert_file_has_content_literal sysroot/boot/loader/entries/ostree-1-testos.conf 'initrd /boot/ostree/testos-'
Expand Down

0 comments on commit f002f92

Please sign in to comment.