diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-11-10 13:44:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-10 13:44:52 -0500 |
| commit | 40f7a343e1666fe53197908602b572e94af587bf (patch) | |
| tree | fe062368856b1ddfbce220c2493c0ae8b6de297b /nixos | |
| parent | dc2649c2f335669b173fbf82743d593a66ccd914 (diff) | |
| parent | c861f8083d96eac4593796e65f8197908ebcbbc1 (diff) | |
| download | nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar.gz nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar.bz2 nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar.lz nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar.xz nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.tar.zst nixpkgs-40f7a343e1666fe53197908602b572e94af587bf.zip | |
Merge pull request #72751 from c00w/sd_image_hydra
sd-image: Add the compressed file path for hydra.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index d510f3b2daf..7865b767f0b 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -140,7 +140,11 @@ in export img=$out/sd-image/${config.sdImage.imageName} echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system - echo "file sd-image $img" >> $out/nix-support/hydra-build-products + if test -n "$compressImage"; then + echo "file sd-image $img.bz2" >> $out/nix-support/hydra-build-products + else + echo "file sd-image $img" >> $out/nix-support/hydra-build-products + fi # Gap in front of the first partition, in MiB gap=8 |