virtualisation/google-compute: use system.build.image

phaer 41db5209 a230d522

Changed files
+8 -4
nixos
modules
virtualisation
+8 -4
nixos/modules/virtualisation/google-compute-image.nix
···
imports = [
./google-compute-config.nix
./disk-size-option.nix
+
../image/file-options.nix
(lib.mkRenamedOptionModuleWith {
sinceRelease = 2411;
from = [
···
fsType = "vfat";
};
+
system.nixos.tags = [ "google-compute" ];
+
image.extension = "raw.tar.gz";
+
system.build.image = config.system.build.googleComputeImage;
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
+
inherit (config.image) baseName;
postVM = ''
PATH=$PATH:${
with pkgs;
···
]
}
pushd $out
-
mv $diskImage disk.raw
-
tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \
-
nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz
-
rm $out/disk.raw
+
tar -Sc $diskImage | gzip -${toString cfg.compressionLevel} > \
+
${config.image.fileName}
+
rm $diskImage
popd
'';
format = "raw";