shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Enable sysroot.bootprefix by default

Browse Source 
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.
This commit is contained in:
Colin Walters 2024-02-05 14:14:27 -05:00
parent ecbd1f7fdd
commit 8627c8afa1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo.c
View File

@ -3346,7 +3346,7 @@ reload_sysroot_config (OstreeRepo *self, GCancellable *cancellable, GError **err
g_hash_table_replace (self->bls_append_values, key, value); 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)) &self->enable_bootprefix, error))
return FALSE; return FALSE;

12
tests/test-admin-deploy-bootprefix.sh
View File

@ -25,11 +25,19 @@ set -euo pipefail
setup_os_repository "archive" "syslinux" 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 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 ${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 'linux /boot/ostree/testos-'
assert_file_has_content_literal sysroot/boot/loader/entries/ostree-1-testos.conf 'initrd /boot/ostree/testos-' assert_file_has_content_literal sysroot/boot/loader/entries/ostree-1-testos.conf 'initrd /boot/ostree/testos-'
tap_ok "bootprefix" tap_ok "bootprefix on"
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo config set sysroot.bootprefix 'false'
${CMD_PREFIX} ostree admin undeploy 0
${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 /ostree/testos-'
assert_file_has_content_literal sysroot/boot/loader/entries/ostree-1-testos.conf 'initrd /ostree/testos-'
tap_ok "bootprefix off"
tap_end tap_end