mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge pull request #8175 from wizeman/u/zfs-fix-rm
zfs: Fix systemd warning
This commit is contained in:
commit
08d4e4ce18
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences
|
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
|
||||||
, configFile ? "all"
|
, configFile ? "all"
|
||||||
|
|
||||||
# Userspace dependencies
|
# Userspace dependencies
|
||||||
@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
|
|||||||
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||||
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||||
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
|
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
|
||||||
|
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
|
||||||
|
--replace "@bindir@/rm " "${coreutils}/bin/rm "
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user