bootc: use a couple of bootc new features

See bootc-dev/bootc#1978
And bootc-dev/bootc#1909

Author: jbtrystram

src/cmdlib.sh

@@ -770,7 +770,7 @@ runvm() {
 
     # include COSA in the image
     find /usr/lib/coreos-assembler/ -type f > "${vmpreparedir}/hostfiles"
-    # Include arbitrary files from the host  
+# Include arbitrary files from the host  
 #     cat <<EOF >> "${vmpreparedir}/hostfiles"
 # /usr/lib/osbuild/stages/org.osbuild.ln
 # /usr/lib/osbuild/stages/org.osbuild.ln.meta.json

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

@@ -351,6 +351,10 @@ pipelines:
           # See github.com/bootc-dev/bootc/issues/1441
           boot-mount-spec: ""
           root-mount-spec: ""
+          # We don't want bootupd to stamp the boot and UEFI paritions
+          # with the boot uuid because these will change at first boot.
+          # See https://github.com/coreos/fedora-coreos-config/pull/3898
+          bootupd-skip-boot-uuid: true
         devices:
           disk:
             type: org.osbuild.loopback
@@ -621,6 +625,10 @@ pipelines:
           # See github.com/bootc-dev/bootc/issues/1441
           boot-mount-spec: ""
           root-mount-spec: ""
+          # We don't want bootupd to stamp the boot and UEFI paritions
+          # with the boot uuid because these will change at first boot.
+          # See https://github.com/coreos/fedora-coreos-config/pull/3898
+          bootupd-skip-boot-uuid: true
         devices:
           disk:
             type: org.osbuild.loopback

src/supermin-init-prelude.sh

@@ -97,3 +97,8 @@ cat > /usr/lib/ostree/prepare-root.conf <<EOF
 [composefs]
 enabled = true
 EOF
+
+cat <<EOF > /usr/lib/bootc/install/10-ostree.toml
+[install.ostree]
+bls-append-except-default = 'grub_users=""'
+EOF