Skip to content

Commit 4b73ee0

Browse files
committed
bootc: use a couple of bootc new features
See bootc-dev/bootc#1978 And bootc-dev/bootc#1909
1 parent ba0df51 commit 4b73ee0

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

src/osbuild-manifests/coreos.osbuild.x86_64.bootc.mpp.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ pipelines:
341341
# See github.com/bootc-dev/bootc/issues/1441
342342
boot-mount-spec: ""
343343
root-mount-spec: ""
344+
# We don't want bootupd to stamp the boot and UEFI paritions
345+
# with the boot uuid because these will change at first boot.
346+
# See https://github.com/coreos/fedora-coreos-config/pull/3898
347+
bootupd-skip-boot-uuid: true
344348
devices:
345349
disk:
346350
type: org.osbuild.loopback
@@ -390,6 +394,10 @@ pipelines:
390394
partition:
391395
mpp-format-int: '{image.layout[''boot''].partnum}'
392396
target: /boot
397+
# We historically created an aleph file named .coreos-aleph-version.json
398+
# in the sysroot partition, for debugging purposes. bootc create it's
399+
# own that is mostly the same content. Let's make a symlink to it
400+
# for backward compatibility.
393401
- type: org.osbuild.ln
394402
options:
395403
paths:
@@ -617,6 +625,10 @@ pipelines:
617625
# See github.com/bootc-dev/bootc/issues/1441
618626
boot-mount-spec: ""
619627
root-mount-spec: ""
628+
# We don't want bootupd to stamp the boot and UEFI paritions
629+
# with the boot uuid because these will change at first boot.
630+
# See https://github.com/coreos/fedora-coreos-config/pull/3898
631+
bootupd-skip-boot-uuid: true
620632
devices:
621633
disk:
622634
type: org.osbuild.loopback

src/supermin-init-prelude.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,11 @@ cat > /usr/lib/ostree/prepare-root.conf <<EOF
9797
[composefs]
9898
enabled = true
9999
EOF
100+
101+
# TODO move this to an overlay in fedora-coreos-config
102+
# so it get baked into the container at build time. We
103+
# want the container to be the source of truth as much as possible.
104+
cat <<EOF > /usr/lib/bootc/install/10-ostree.toml
105+
[install.ostree]
106+
bls-append-except-default = 'grub_users=""'
107+
EOF

0 commit comments

Comments
 (0)