summaryrefslogtreecommitdiffstats
path: root/nixos/maintainers
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2022-03-08 09:25:26 -0500
committerGraham Christensen <graham@grahamc.com>2022-04-07 15:28:28 -0400
commitb4c495aeffb610cffd08e0000817f02742365dec (patch)
treecaba215b43f77419312016276fdca00d777f97c3 /nixos/maintainers
parent9e3dab7d2e2f7e08baa65dfec78e27343608bdbd (diff)
openstack-image-zfs: make the generated configuration.nix valid
Drops the wrong expandOnBoot option (defaults to all) and mark ZFS as enabled.
Diffstat (limited to 'nixos/maintainers')
-rw-r--r--nixos/maintainers/scripts/openstack/openstack-image-zfs.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index b18b3265283f..515cc5cb38b3 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -55,8 +55,9 @@ in
configFile = pkgs.writeText "configuration.nix"
''
- {
- imports = [ <nixpkgs/nixos/modules/virtualisation/openstack-config.nix> ];
+ { modulesPath, ... }: {
+ imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
+ openstack.zfs.enable = true;
}
'';