movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

cloudstack: add to image/images

Browse source 
This was an oversight in https://github.com/NixOS/nixpkgs/pull/347275,
so it's currently missing from the variants listed in nixos-rebuild build-image
This commit is contained in:
phaer 2025-04-14 14:03:58 +02:00
parent e0afcb011b
commit d7e76ed0a2
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
View file

@ -8,10 +8,19 @@
}: }:
{ {
imports = [ ../../../modules/virtualisation/cloudstack-config.nix ]; imports = [
../../../modules/virtualisation/cloudstack-config.nix
../../../modules/image/file-options.nix
];
system.nixos.tags = [ "cloudstack" ];
image.extension = "qcow2";
system.build.image = config.system.build.cloudstackImage;
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config pkgs; inherit lib config pkgs;
inherit (config.virtualisation) diskSize;
baseName = config.image.baseName;
format = "qcow2"; format = "qcow2";
configFile = pkgs.writeText "configuration.nix" '' configFile = pkgs.writeText "configuration.nix" ''
{ {

1
nixos/modules/image/images.nix
View file

@ -11,6 +11,7 @@ let
imageModules = { imageModules = {
amazon = ../../maintainers/scripts/ec2/amazon-image.nix; amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
azure = ../virtualisation/azure-image.nix; azure = ../virtualisation/azure-image.nix;
cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;
digital-ocean = ../virtualisation/digital-ocean-image.nix; digital-ocean = ../virtualisation/digital-ocean-image.nix;
google-compute = ../virtualisation/google-compute-image.nix; google-compute = ../virtualisation/google-compute-image.nix;
hyperv = ../virtualisation/hyperv-image.nix; hyperv = ../virtualisation/hyperv-image.nix;

3
nixos/modules/virtualisation/cloudstack-config.nix
View file

@ -8,9 +8,10 @@ with lib;
]; ];
config = { config = {
fileSystems."/" = { fileSystems."/" = lib.mkImageMediaOverride {
device = "/dev/disk/by-label/nixos"; device = "/dev/disk/by-label/nixos";
autoResize = true; autoResize = true;
fsType = "ext4";
}; };
boot.growPartition = true; boot.growPartition = true;