osbuild: switch compression to off; workaround image corruption

build.sh

@@ -45,7 +45,7 @@ install_rpms() {
     frozendeps=""
 
     # We freeze the version for now since we're carrying patches.
-    frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-106-1.fc39.noarch)"
+    frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-108-1.fc39.noarch)"
 
     # First, a general update; this is best practice.  We also hit an issue recently
     # where qemu implicitly depended on an updated libusbx but didn't have a versioned
@@ -176,24 +176,9 @@ patch_osbuild() {
     mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
 
     # Now all the software is under the /usr/lib/osbuild dir and we can patch
-    cat /usr/lib/coreos-assembler/0001-stages-ostree.config-support-setting-sysroot.bootpre.patch \
-        /usr/lib/coreos-assembler/0001-mounts-ostree.deployment-rework-unmounting.patch           \
-        /usr/lib/coreos-assembler/0002-mounts-ostree.deployment-rename-var-root-deploy_root.patch \
-        /usr/lib/coreos-assembler/0003-mounts-ostree.deployment-use-target-instead-of-tree.patch  \
-        /usr/lib/coreos-assembler/0004-mounts-ostree.deployment-support-deployments-on-moun.patch \
-        /usr/lib/coreos-assembler/0005-Create-stages-org.osbuild.chattr-stage.patch               \
-        /usr/lib/coreos-assembler/0001-fscache-add-new-FsCache._last_used_objs-helper.patch       \
-        /usr/lib/coreos-assembler/0002-fscache-add-FsCache._remove_lru-to-remove-entries.patch    \
-        /usr/lib/coreos-assembler/0003-fscache-use-remove_lru-to-reclaim-space-when-the-cac.patch \
-        /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                   \
+    cat /usr/lib/coreos-assembler/0004-fscache-add-eviction-log-statement.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-ostree-add-convenience-function-for-using-default-OS.patch \
-        /usr/lib/coreos-assembler/0001-stages-org.osbuild.qemu-make-qcow2-compression-optio.patch \
-        /usr/lib/coreos-assembler/0001-mount-ostree.deployment-Fix-ostree-deployment-call.patch   \
+        /usr/lib/coreos-assembler/0001-stages-qemu-sanity-check-created-image.patch               \
             | patch -d /usr/lib/osbuild -p1
 
     # And then move the files back; supermin appliance creation will need it back

mantle/platform/qemu.go

@@ -1071,6 +1071,8 @@ func (disk *Disk) prepare(builder *QemuBuilder) error {
 			// on our own.
 			if strings.HasSuffix(backingFile, "qcow2") {
 				format = "qcow2"
+			} else if strings.HasSuffix(backingFile, "raw") {
+				format = "raw"
 			}
 		}
 		if format != "" {