examples: factor out fsck.erofs call

Move this to the common/make-image script to reduce a bit of
duplication.  There should always be exactly one image, so just glob.

Signed-off-by: Allison Karlitskaya <[email protected]>

Author: allisonkarlitskaya

examples/bls/build

@@ -51,7 +51,6 @@ podman build \
 BASE_ID="$(sed s/sha256:// tmp/base.iid)"
 ${CFSCTL} oci pull containers-storage:${BASE_ID}
 BASE_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${BASE_ID}")"
-fsck.erofs "tmp/sysroot/composefs/images/${BASE_IMAGE_FSVERITY}"
 
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/upper"

examples/common/make-image

@@ -4,6 +4,9 @@ set -eux
 
 output="$1"
 
+# check that the image doesn't have errors
+fsck.erofs tmp/sysroot/composefs/images/*
+
 fakeroot "${0%/*}/run-repart" tmp/image.raw
 qemu-img convert -f raw tmp/image.raw -O qcow2 "${output}"
 rm tmp/image.raw

examples/uki/build

@@ -55,7 +55,6 @@ ${PODMAN_BUILD} \
 FINAL_ID="$(sed s/sha256:// tmp/final.iid)"
 ${CFSCTL} oci pull containers-storage:"${FINAL_ID}"
 FINAL_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${FINAL_ID}")"
-fsck.erofs "tmp/sysroot/composefs/images/${FINAL_IMAGE_FSVERITY}"
 
 ## IMPORTANT: the filesystems of the base and final images are identical
 test "${BASE_IMAGE_FSVERITY}" = "${FINAL_IMAGE_FSVERITY}"

examples/unified-secureboot/build

@@ -49,7 +49,6 @@ podman build \
 IMAGE_ID="$(sed s/sha256:// tmp/iid)"
 ${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"
 IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"
-fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"
 
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/upper"

examples/unified/build

@@ -31,7 +31,6 @@ podman build \
 IMAGE_ID="$(sed s/sha256:// tmp/iid)"
 ${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"
 IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"
-fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"
 
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/upper"