lol

cloudstack: add to image/images (#398556)

authored by

jopejoe1 and committed by
GitHub
e6d927fc 326702f8

+13 -2
+10 -1
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
··· 8 8 }: 9 9 10 10 { 11 - imports = [ ../../../modules/virtualisation/cloudstack-config.nix ]; 11 + imports = [ 12 + 13 + ../../../modules/virtualisation/cloudstack-config.nix 14 + ../../../modules/image/file-options.nix 15 + ]; 12 16 17 + system.nixos.tags = [ "cloudstack" ]; 18 + image.extension = "qcow2"; 19 + system.build.image = config.system.build.cloudstackImage; 13 20 system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { 14 21 inherit lib config pkgs; 22 + inherit (config.virtualisation) diskSize; 23 + baseName = config.image.baseName; 15 24 format = "qcow2"; 16 25 configFile = pkgs.writeText "configuration.nix" '' 17 26 {
+1
nixos/modules/image/images.nix
··· 11 11 imageModules = { 12 12 amazon = ../../maintainers/scripts/ec2/amazon-image.nix; 13 13 azure = ../virtualisation/azure-image.nix; 14 + cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix; 14 15 digital-ocean = ../virtualisation/digital-ocean-image.nix; 15 16 google-compute = ../virtualisation/google-compute-image.nix; 16 17 hyperv = ../virtualisation/hyperv-image.nix;
+2 -1
nixos/modules/virtualisation/cloudstack-config.nix
··· 8 8 ]; 9 9 10 10 config = { 11 - fileSystems."/" = { 11 + fileSystems."/" = lib.mkImageMediaOverride { 12 12 device = "/dev/disk/by-label/nixos"; 13 13 autoResize = true; 14 + fsType = "ext4"; 14 15 }; 15 16 16 17 boot.growPartition = true;