diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-10-15 11:45:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 11:45:52 +0100 |
| commit | faa7ce3ee5144330567bb15bc0559d080f6a3367 (patch) | |
| tree | 95b53a7e8db9381f91a570c43d99c30fe8a012d4 | |
| parent | e071809101f4c33aba4dcba00284a4b01ec76ec6 (diff) | |
| parent | 17f76a906ef15f7f62986741c7c494d997363719 (diff) | |
| download | nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar.gz nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar.bz2 nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar.lz nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar.xz nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.tar.zst nixpkgs-faa7ce3ee5144330567bb15bc0559d080f6a3367.zip | |
Merge pull request #70240 from woffs/pr-etc-zpool.d
nixos module zfs: provide /etc/zfs/zpool.d
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index baf6da8b6f7..fe11917c609 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -390,6 +390,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 ] diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 985faa51951..ae72aad6c07 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 = { |