Merge pull request #70240 from woffs/pr-etc-zpool.d
nixos module zfs: provide /etc/zfs/zpool.d
This commit is contained in:
commit
faa7ce3ee5
@ -390,6 +390,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/";
|
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
|
system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
|
||||||
environment.systemPackages = [ packages.zfsUser ]
|
environment.systemPackages = [ packages.zfsUser ]
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
, libtirpc
|
, libtirpc
|
||||||
, nfs-utils
|
, nfs-utils
|
||||||
, gawk, gnugrep, gnused, systemd
|
, gawk, gnugrep, gnused, systemd
|
||||||
|
, smartmontools, sysstat, sudo
|
||||||
|
|
||||||
# Kernel dependencies
|
# Kernel dependencies
|
||||||
, kernel ? null
|
, kernel ? null
|
||||||
@ -131,6 +132,13 @@ let
|
|||||||
(cd $out/share/bash-completion/completions; ln -s zfs zpool)
|
(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" ];
|
outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
Reference in New Issue
Block a user