Unverified Commit d16aa077 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

nixos/lib/make-*-disk-zfs-image: fix build

Those two helpers have not received the memo about a new requirement for
virtiofs and about changes regarding the zfs related attributes.

Can be tested with nix/release.nix' amazonImageZfs.
parent a6dbc4b6
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ let
  };

  modulesTree = pkgs.aggregateModules (
    with config.boot.kernelPackages;
    with config.boot;
    [
      kernel
      zfs
      kernelPackages.kernel
      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
    ]
  );

@@ -254,11 +254,12 @@ let
  image =
    (pkgs.vmTools.override {
      rootModules = [
        "zfs"
        "9p"
        "9pnet_virtio"
        "virtio_pci"
        "virtio_blk"
        "virtio_pci"
        "virtiofs"
        "zfs"
      ];
      kernel = modulesTree;
    }).runInLinuxVM
+6 −5
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ let
  };

  modulesTree = pkgs.aggregateModules (
    with config.boot.kernelPackages;
    with config.boot;
    [
      kernel
      zfs
      kernelPackages.kernel
      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
    ]
  );

@@ -242,11 +242,12 @@ let
  image =
    (pkgs.vmTools.override {
      rootModules = [
        "zfs"
        "9p"
        "9pnet_virtio"
        "virtio_pci"
        "virtio_blk"
        "virtio_pci"
        "virtiofs"
        "zfs"
      ];
      kernel = modulesTree;
    }).runInLinuxVM