diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-12 18:21:33 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-12 18:24:26 +0000 |
| commit | a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786 (patch) | |
| tree | f1ab44972683f29f5f8aa51ffee393155459f517 /nixos/lib | |
| parent | f7bb8d2dfa6a1960f9a4b90e55ac7fce84fcc059 (diff) | |
| download | nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar.gz nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar.bz2 nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar.lz nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar.xz nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.tar.zst nixpkgs-a2d3ee77b8dc2ed3dd9562ac8f11c56c65588786.zip | |
make-disk-image: clean up
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 9d1327d9c15..e4480b26c64 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -40,11 +40,11 @@ with lib; let - extensions = { + filename = "nixos." + { qcow2 = "qcow2"; vpc = "vhd"; raw = "img"; - }; + }.${format}; nixpkgs = cleanSource pkgs.path; @@ -125,7 +125,7 @@ let fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure echo "copying staging root to image..." - cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* / + cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* / ''; in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name @@ -134,12 +134,11 @@ in pkgs.vmTools.runInLinuxVM ( exportReferencesGraph = [ "closure" metaClosure ]; postVM = '' ${if format == "raw" then '' - mv $diskImage $out/nixos.img - diskImage=$out/nixos.img + mv $diskImage $out/${filename} '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}} - diskImage=$out/nixos.${extensions.${format}} + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/${filename} ''} + diskImage=$out/${filename} ${postVM} ''; memSize = 1024; |