From 849e3dd0434211a76f3f7857e77da73959874890 Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Fri, 8 Jan 2021 05:31:17 +0000 Subject: gnu: zfs: Correct ZFS udev rules. * gnu/packages/file-systems.scm (zfs): Add substitutions for /sbin/modprobe in udev rules. Signed-off-by: Efraim Flashner --- gnu/packages/file-systems.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0a36b7345a..d391065e70 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -885,7 +885,8 @@ (define-public zfs (let ((out (assoc-ref outputs "out")) (src (assoc-ref outputs "src")) (util-linux (assoc-ref inputs "util-linux")) - (nfs-utils (assoc-ref inputs "nfs-utils"))) + (nfs-utils (assoc-ref inputs "nfs-utils")) + (kmod (assoc-ref inputs "kmod-runtime"))) (substitute* "contrib/Makefile.in" ;; This is not configurable nor is its hard-coded /usr prefix. ((" initramfs") "")) @@ -915,7 +916,9 @@ (define-public zfs (substitute* "contrib/pyzfs/Makefile.in" ((".*install-lib.*") "")) (substitute* '("Makefile.am" "Makefile.in") - (("\\$\\(prefix)/src") (string-append src "/src")))) + (("\\$\\(prefix)/src") (string-append src "/src"))) + (substitute* (find-files "udev/rules.d/" ".rules.in$") + (("/sbin/modprobe") (string-append kmod "/bin/modprobe")))) #t)) (replace 'build (lambda _ (invoke "make"))) @@ -939,6 +942,7 @@ (define-public zfs ("pkg-config" ,pkg-config))) (inputs `(("eudev" ,eudev) + ("kmod-runtime" ,kmod) ("libaio" ,libaio) ("libtirpc" ,libtirpc) ("nfs-utils" ,nfs-utils) -- cgit v1.2.3