diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-06-14 10:39:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-14 10:39:10 +0800 |
commit | eb62c7edc8fe007a0e2cfa408ddb74b4f6a9bbd1 (patch) | |
tree | 5f99a52780c4c1c2b375bd63ad60b584cf757f35 | |
parent | f97f334a6c1b610d8dbcadb15e9c982090c664ad (diff) | |
parent | 490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c (diff) |
Merge pull request #90261 from prusnak/installer-zstd-rm
images: remove original files when using zstd for compression
-rw-r--r-- | nixos/lib/make-iso9660-image.sh | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index eb9edcd702699..d64fe9a365e75 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -129,7 +129,7 @@ fi if test -n "$compressImage"; then echo "Compressing image..." - zstd -T$NIX_BUILD_CORES $out/iso/$isoName + zstd -T$NIX_BUILD_CORES --rm $out/iso/$isoName fi mkdir -p $out/nix-support diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 589bf74263b9e..98c12e30633c4 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -190,7 +190,7 @@ in fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS if test -n "$compressImage"; then - zstd -T$NIX_BUILD_CORES $img + zstd -T$NIX_BUILD_CORES --rm $img fi ''; }) {}; |