diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2015-06-04 17:31:30 +0200 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2015-06-04 17:35:39 +0200 |
| commit | 3afae4037b7deac7af54f45dc4b2e027c4335e48 (patch) | |
| tree | a4c0434ab1869600c7e3c102abb2bc30a8a10a50 /pkgs | |
| parent | f1d465f429252d7c58a920ad9d7ee93e34e7fad9 (diff) | |
| download | nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar.gz nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar.bz2 nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar.lz nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar.xz nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.tar.zst nixlib-3afae4037b7deac7af54f45dc4b2e027c4335e48.zip | |
zfs: Fix systemd warning
The `zfs-share` service was trying to execute the `rm` binary, but it was providing an invalid `/bin` path. This should fix #8171.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b040201cf337..1613dcb311a2 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils , configFile ? "all" # Userspace dependencies @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " ./autogen.sh ''; |