about summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-11-12 18:29:01 +0000
committerOrivej Desh <orivej@gmx.fr>2017-11-12 18:39:36 +0000
commit27f5cc959bd3beb93352f65c0ce0d4f7aa4f63f8 (patch)
tree39978fb2f1bfac87c7b66e4acfaf2371bff23d38 /nixos/lib
parent608de48fe42364ea4062513d1d651430b18d8787 (diff)
make-disk-image: embed compression switch into the format name
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/make-disk-image.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index c2a5415d1b2a7..226817cf6a7f1 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -33,17 +33,17 @@
 
 , name ? "nixos-disk-image"
 
-, # Disk image format, one of qcow2, vpc, raw.
+, # Disk image format, one of qcow2, qcow2-compressed, vpc, raw.
   format ? "raw"
-
-, # Whether to compress the image, applicable only when the format is qcow2.
-  compressed ? false
 }:
 
 with lib;
 
-let
-  compress = optionalString compressed (assert format == "qcow2"; "-c");
+let format' = format; in let
+
+  format = if (format' == "qcow2-compressed") then "qcow2" else format;
+
+  compress = optionalString (format' == "qcow2-compressed") "-c";
 
   filename = "nixos." + {
     qcow2 = "qcow2";