set sysroot.bootprefix true in OSTree config

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.

build.sh

@@ -188,7 +188,6 @@ patch_osbuild() {
         /usr/lib/coreos-assembler/0004-fscache-add-eviction-log-statement.patch                   \
         /usr/lib/coreos-assembler/0001-support-user-defined-partition-numbers-for-GPT-disks.patch \
         /usr/lib/coreos-assembler/0002-stages-sgdisk-support-label-option.patch                   \
-        /usr/lib/coreos-assembler/0001-stages-zipl.inst-improve-kernel-initrd-path-resoluti.patch \
         /usr/lib/coreos-assembler/0002-stages-zipl.inst-support-appending-kernel-options.patch    \
         /usr/lib/coreos-assembler/0001-stages-copy-allow-copying-from-the-tree.patch              \
         /usr/lib/coreos-assembler/0001-stages-qemu-don-t-use-internal-compression-for-now.patch   \

src/coreos.osbuild.aarch64.mpp.yaml

@@ -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:

src/coreos.osbuild.ppc64le.mpp.yaml

@@ -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
       # platforms.json will live here
       - type: org.osbuild.mkdir
         options:

src/coreos.osbuild.s390x.mpp.yaml

@@ -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
       # platforms.json will live here
       - type: org.osbuild.mkdir
         options:

src/coreos.osbuild.x86_64.mpp.yaml

@@ -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:

src/create_disk.sh

@@ -316,6 +316,12 @@ ostree config --repo $rootfs/ostree/repo set sysroot.bootloader none
 # Opt-in to https://github.com/ostreedev/ostree/pull/1767 AKA
 # https://github.com/ostreedev/ostree/issues/1265
 ostree config --repo $rootfs/ostree/repo set sysroot.readonly true
+# 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.
+ostree config --repo $rootfs/ostree/repo set sysroot.bootprefix true
 if test -n "${composefs}"; then
     ostree config --repo $rootfs/ostree/repo set ex-integrity.composefs true
 fi