shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-18 10:04:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3159 from cgwalters/revert-bootprefix

Browse Source 
Revert "Enable `sysroot.bootprefix` by default"
This commit is contained in:
Eric Curtin 2024-02-07 23:26:25 +01:00 committed by GitHub
commit da89214065
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 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", TRUE, if (!ot_keyfile_get_boolean_with_default (self->config, "sysroot", "bootprefix", FALSE,
&self->enable_bootprefix, error)) &self->enable_bootprefix, error))
return FALSE; return FALSE;

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

@ -25,19 +25,11 @@ 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
# sysroot.bootprefix is on by default now ${CMD_PREFIX} ostree --repo=sysroot/ostree/repo config set sysroot.bootprefix 'true'
${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 on" tap_ok "bootprefix"
${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