From b4c495aeffb610cffd08e0000817f02742365dec Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 8 Mar 2022 09:25:26 -0500
Subject: openstack-image-zfs: make the generated configuration.nix valid

Drops the wrong expandOnBoot option (defaults to all) and mark ZFS as enabled.
---
 nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'nixos/maintainers')

diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index b18b3265283f7..515cc5cb38b39 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;
           }
         '';
 
-- 
cgit 1.4.1