Merge pull request #70240 from woffs/pr-etc-zpool.d

nixos module zfs: provide /etc/zfs/zpool.d
This commit is contained in:
Jörg Thalheim 2019-10-15 11:45:52 +01:00 committed by GitHub
commit faa7ce3ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions

View file

@ -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 ]

View file

@ -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 = {