Unverified Commit e3f94064 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

nixos/zfs: do not auto-import pools marked noauto (#352391)

parents b4cf66f2 7f8278a2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@
  2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
  details.

- The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot.

- `nodePackages.stackdriver-statsd-backend` has been removed, as the StackDriver service has been discontinued by Google, and therefore the package no longer works.

- the notmuch vim plugin now lives in a separate output of the `notmuch`
+3 −1
Original line number Diff line number Diff line
@@ -128,7 +128,9 @@ let
        "systemd-modules-load.service"
        "systemd-ask-password-console.service"
      ] ++ lib.optional (config.boot.initrd.clevis.useTang) "network-online.target";
      requiredBy = getPoolMounts prefix pool ++ [ "zfs-import.target" ];
      requiredBy = let
        noauto = lib.all (fs: lib.elem "noauto" fs.options) (getPoolFilesystems pool);
      in getPoolMounts prefix pool ++ lib.optional (!noauto) "zfs-import.target";
      before = getPoolMounts prefix pool ++ [ "shutdown.target" "zfs-import.target" ];
      conflicts = [ "shutdown.target" ];
      unitConfig = {