From bb6586c4e69be4bdfaa5d560cf72fb5af41be9b8 Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 8 Oct 2024 11:26:13 +0200 Subject: [PATCH] make-disk-image: Allow passing of image baseName It's currently alsways "nixos", which leads to various schemes of renaming the resulting files in virtualisation/*-image.nix files as well as further downstream, outside of nixpkgs. --- nixos/lib/make-disk-image.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index a943edb7b574..17c250d26670 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -163,6 +163,9 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag , # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. format ? "raw" +, # Disk image filename, without any extensions (e.g. `image_1`). + baseName ? "nixos" + # Whether to fix: # - GPT Disk Unique Identifier (diskGUID) # - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option @@ -208,7 +211,7 @@ let format' = format; in let compress = lib.optionalString (format' == "qcow2-compressed") "-c"; - filename = "nixos." + { + filename = "${baseName}." + { qcow2 = "qcow2"; vdi = "vdi"; vpc = "vhd";