Use raw image instead of vhd

NixOS · Apr 19, 2024 · 159b261 · 159b261
1 parent a33d952
commit 159b261
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/upload-ami/default.nix b/upload-ami/default.nix
@@ -2,6 +2,7 @@
 , python3Packages
 , lib
 , coldsnap
+, qemu
 }:
 
 let
@@ -39,7 +40,7 @@ buildPythonApplication {
     ];
 
 
-  makeWrapperArgs = [ "--prefix PATH : ${coldsnap}/bin" ];
+  makeWrapperArgs = [ "--prefix PATH : ${coldsnap}/bin" "--prefix PATH : ${qemu}/bin" ];
 
   propagatedBuildInputs = lib.flatten (map resolvePackages pyproject.project.dependencies);
 

diff --git a/upload-ami/src/upload_ami/upload_coldsnap.py b/upload-ami/src/upload_ami/upload_coldsnap.py
@@ -1,7 +1,12 @@
 import argparse
+from email.mime import image
 import json
 import logging
+from pathlib import Path
+from posixpath import basename
 from re import I
+from tempfile import mktemp
+import tempfile
 import boto3
 import subprocess
 from typing import Literal, TypedDict
@@ -93,12 +98,19 @@ def upload_coldsnap(
 ) -> str:
     logging.info(f"Uploading image to coldsnap")
 
+    image_file_vhd = Path(image_info["file"])
+    image_file_raw = image_file_vhd.with_suffix(".raw")
+
+    subprocess.check_call(
+        [ "qemu-img" , "convert", "-O", "raw", image_file_vhd, image_file_raw ]
+    )
+
     snapshot_id = subprocess.check_output(
             [
                 "coldsnap",
                 "upload",
                 "--wait",
-                image_info["file"],
+                image_file_raw,
             ]
         ).decode().strip()