Merge branch 'develop' into dlpx/pr/prakashsurya/8b2a25af-7062-483d-8…

…f4b-a373e76d4473

live-build/config/hooks/vm-artifacts/92-ova-machine-image.binary

@@ -47,8 +47,7 @@ esac
 
 DATE=$(date --utc --iso-8601=seconds)
 
-VMDK_FILESIZE=$(qemu-img info --output=json "$ARTIFACT_NAME.vmdk" |
-	jq '.["actual-size"]')
+VMDK_FILESIZE=$(stat -c %s "$ARTIFACT_NAME.vmdk")
 VMDK_CAPACITY=$(qemu-img info --output=json "$ARTIFACT_NAME.vmdk" |
 	jq '.["virtual-size"]')
 

upgrade/upgrade-scripts/rootfs-cleanup

@@ -26,6 +26,10 @@ def version(rootfs: str) -> str:
         ]).decode("UTF-8").strip())
 
 
+def exists(rootfs: str) -> bool:
+    return not bool(subprocess.run(["zfs", "list", rootfs]).returncode)
+
+
 #
 # Helper class used when sorting rootfs filesystems and snapshots. This allows
 # us to use the "sorted" builtin, to build a list of all rootfs filesystems and
@@ -111,6 +115,13 @@ def main() -> None:
     # after an upgrade (i.e. we never upgrade to a lower version).
     #
     for rootfs in sorted(filesystems + snapshots, key=rootfscmp)[:-2]:
+        #
+        # Skip if the snapshot or filesystem was destroyed by a previous
+        # iteration.
+        #
+        if not exists(rootfs):
+            continue
+
         #
         # In the event of a rollback, we want to be careful to not
         # delete the currently running version, as well as any versions