From eb3c49d37c2b90b69e25222dcac7ff9907a7d4cb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 15 Feb 2024 13:08:57 -0500
Subject: [PATCH] Drop composefs setting

Since https://github.com/ostreedev/ostree/pull/3165
this can be configured in the ostree commit itself.
---
 src/cmd-build          | 18 ------------------
 src/create_disk.sh     |  6 +-----
 src/image-default.yaml |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/cmd-build b/src/cmd-build
index a88faea328..ebc0a8e9cd 100755
--- a/src/cmd-build
+++ b/src/cmd-build
@@ -335,24 +335,6 @@ if test "${PREPARE_ONLY}" = 1; then
     exit 0
 fi
 
-# See https://github.com/coreos/coreos-assembler/pull/1379 - we want the local
-# dev case to explicitly fetch updates when they want them, plus CI pipelines
-# generally want to react to "changed or not" with a separate `fetch`.
-# The fetched-stamp is new, in order to not break existing workdirs we assume
-# a fetch was done if a successful build was done.
-if [ ! -f "${workdir}"/builds/builds.json ] && [ ! -f "${fetch_stamp}" ] ; then
-    fatal "Must fetch before building"
-fi
-composefs="$(jq -r .composefs < "${image_json}")"
-case "${composefs}" in
-    false) 
-    ;;
-    true)
-        ostree config --repo="${tmprepo}" set ex-integrity.composefs "true"
-    ;;
-    *) fatal "Unhandled composefs setting: ${composefs}" ;;
-esac
-
 # --cache-only is here since `fetch` is a separate verb
 # shellcheck disable=SC2086
 if test -n "${previous_commit}"; then
diff --git a/src/create_disk.sh b/src/create_disk.sh
index c93006688f..354bce15b4 100755
--- a/src/create_disk.sh
+++ b/src/create_disk.sh
@@ -118,7 +118,6 @@ esac
 rootfs_args=$(getconfig_def "rootfs-args" "")
 
 bootfs=$(getconfig "bootfs")
-composefs=$(getconfig_def "composefs" "")
 grub_script=$(getconfig "grub-script")
 ostree_container=$(getconfig "ostree-container")
 ostree_container_spec="ostree-unverified-image:oci-archive:${ostree_container}"
@@ -316,14 +315,11 @@ 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
-if test -n "${composefs}"; then
-    ostree config --repo $rootfs/ostree/repo set ex-integrity.composefs true
-fi
 # Initialize the "stateroot"
 ostree admin os-init "$os_name" --sysroot $rootfs
 
 # Propagate flags into target repository
-if [ "${rootfs_type}" = "ext4verity" ] && [ -z "${composefs}" ]; then
+if [ "${rootfs_type}" = "ext4verity" ]; then
     ostree config --repo=$rootfs/ostree/repo set ex-fsverity.required 'true'
 fi
 
diff --git a/src/image-default.yaml b/src/image-default.yaml
index a3e6556729..3fbcc7480c 100644
--- a/src/image-default.yaml
+++ b/src/image-default.yaml
@@ -4,8 +4,6 @@ bootfs: "ext4"
 rootfs: "xfs"
 # Add arguments here that will be passed to e.g. mkfs.xfs
 rootfs-args: ""
-# Set to "true" to enable composefs
-composefs: false
 
 # Additional default kernel arguments injected into disk images
 extra-kargs: []