Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e071809101f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: faa7ce3ee514
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 2, 2019

  1. 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
    @woffs
    woffs committed Oct 2, 2019
    Copy the full SHA
    3065d00 View commit details

Commits on Oct 4, 2019

  1. zfs: fix PATH for zpool.d scripts

    @woffs
    woffs committed Oct 4, 2019
    Copy the full SHA
    17f76a9 View commit details

Commits on Oct 15, 2019

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

    nixos module zfs: provide /etc/zfs/zpool.d
    @Mic92
    Mic92 authored Oct 15, 2019
    Copy the full SHA
    faa7ce3 View commit details
Showing with 9 additions and 0 deletions.
  1. +1 −0 nixos/modules/tasks/filesystems/zfs.nix
  2. +8 −0 pkgs/os-specific/linux/zfs/default.nix
1 change: 1 addition & 0 deletions nixos/modules/tasks/filesystems/zfs.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ]
8 changes: 8 additions & 0 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {