From 3afae4037b7deac7af54f45dc4b2e027c4335e48 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 4 Jun 2015 17:31:30 +0200 Subject: [PATCH] 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. --- pkgs/os-specific/linux/zfs/generic.nix | 5 +++-- 1 file 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 '';