Skip to content

Commit

Permalink
osbuild: set sysroot.bootprefix true in OSTree config
Browse files Browse the repository at this point in the history
This is a second round of f5677a3 (reverted in db7bf08).

Now that coreos-installer in rawhide has
coreos/coreos-installer#1422
we can set sysroot.bootprefix to true again.

We can't do it in the non-OSBuild configs because not all streams
have the new coreos-installer yet.

Here is the comment from the original commit:

This setting will make it so that BLS config entries get prepended
with /boot. OSTree already places a boot -> . symlink in the root
of the boot filesystem prepending with /boot will always just work.

For context see osbuild/osbuild#1566 (comment)

This also allows for dropping one of the upstream OSBuild zipl stage
patches.
  • Loading branch information
dustymabe committed Feb 26, 2024
1 parent eef9194 commit a7d4312
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 40 deletions.
1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ patch_osbuild() {

# Now all the software is under the /usr/lib/osbuild dir and we can patch
cat /usr/lib/coreos-assembler/0004-fscache-add-eviction-log-statement.patch \
/usr/lib/coreos-assembler/0001-stages-zipl.inst-improve-kernel-initrd-path-resoluti.patch \
/usr/lib/coreos-assembler/0001-stages-qemu-sanity-check-created-image.patch \
/usr/lib/coreos-assembler/0001-util-Add-bls-module.patch \
/usr/lib/coreos-assembler/0002-Add-coreos.platforms-stage.patch \
Expand Down

This file was deleted.

6 changes: 6 additions & 0 deletions src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ pipelines:
bootloader: none
# https://github.com/coreos/fedora-coreos-tracker/issues/1333
bls-append-except-default: grub_users=""
# Opt-in to https://github.com/ostreedev/ostree/pull/2705 which will
# add /boot as the prefix on top of BLS config entries. This is OK
# because there is a symlink that is created in the root of the boot
# filesystem by OSTree (boot -> .) that makes it so that /boot paths
# will always work.
bootprefix: true
- type: org.osbuild.mkdir
options:
paths:
Expand Down
6 changes: 6 additions & 0 deletions src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ pipelines:
bootloader: none
# https://github.com/coreos/fedora-coreos-tracker/issues/1333
bls-append-except-default: grub_users=""
# Opt-in to https://github.com/ostreedev/ostree/pull/2705 which will
# add /boot as the prefix on top of BLS config entries. This is OK
# because there is a symlink that is created in the root of the boot
# filesystem by OSTree (boot -> .) that makes it so that /boot paths
# will always work.
bootprefix: true
- type: org.osbuild.ignition
# Deploy via container if we have a container ociarchive, else from repo.
- mpp-if: ociarchive != ''
Expand Down
6 changes: 6 additions & 0 deletions src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ pipelines:
bootloader: none
## no grub_users="" on s390x
#bls-append-except-default: grub_users=""
# Opt-in to https://github.com/ostreedev/ostree/pull/2705 which will
# add /boot as the prefix on top of BLS config entries. This is OK
# because there is a symlink that is created in the root of the boot
# filesystem by OSTree (boot -> .) that makes it so that /boot paths
# will always work.
bootprefix: true
- type: org.osbuild.ignition
# Deploy via container if we have a container ociarchive, else from repo.
- mpp-if: ociarchive != ''
Expand Down
6 changes: 6 additions & 0 deletions src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ pipelines:
bootloader: none
# https://github.com/coreos/fedora-coreos-tracker/issues/1333
bls-append-except-default: grub_users=""
# Opt-in to https://github.com/ostreedev/ostree/pull/2705 which will
# add /boot as the prefix on top of BLS config entries. This is OK
# because there is a symlink that is created in the root of the boot
# filesystem by OSTree (boot -> .) that makes it so that /boot paths
# will always work.
bootprefix: true
- type: org.osbuild.mkdir
options:
paths:
Expand Down

0 comments on commit a7d4312

Please sign in to comment.