From 3065d00d74db70c74b1eee93b91f9e9d7656d527 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 2 Oct 2019 12:34:09 +0200 Subject: [PATCH 1/2] nixos module zfs: provide /etc/zfs/zpool.d The scripts for zpool iostat -c and zpool status -c are located in /etc/zfs/zpool.d --- nixos/modules/tasks/filesystems/zfs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index cfdc0a31020b..e953ed81951d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -392,6 +392,7 @@ in }; environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/"; + environment.etc."zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/"; system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck environment.systemPackages = [ packages.zfsUser ] From 17f76a906ef15f7f62986741c7c494d997363719 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 4 Oct 2019 12:34:15 +0200 Subject: [PATCH 2/2] zfs: fix PATH for zpool.d scripts --- pkgs/os-specific/linux/zfs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 899e5f05509c..802de31b2ae5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -7,6 +7,7 @@ , libtirpc , nfs-utils , gawk, gnugrep, gnused, systemd +, smartmontools, sysstat, sudo # Kernel dependencies , kernel ? null @@ -131,6 +132,13 @@ let (cd $out/share/bash-completion/completions; ln -s zfs zpool) ''; + postFixup = '' + path="PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat sudo ]}" + for i in $out/libexec/zfs/zpool.d/*; do + sed -i "2i$path" $i + done + ''; + outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; meta = {