aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorraid5atemyhomework <raid5atemyhomework@protonmail.com>2021-01-08 05:31:17 +0000
committerEfraim Flashner <efraim@flashner.co.il>2021-01-20 14:34:41 +0200
commit849e3dd0434211a76f3f7857e77da73959874890 (patch)
tree6e3c4c1508c22c762267f6aa50516b5a12c309ed /gnu
parentc64adff4c67fbd43497cbc124865e87dce2f88e6 (diff)
downloadguix-849e3dd0434211a76f3f7857e77da73959874890.tar.gz
guix-849e3dd0434211a76f3f7857e77da73959874890.zip
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 <efraim@flashner.co.il>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/file-systems.scm8
1 files changed, 6 insertions, 2 deletions
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 @@ APFS.")
(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 @@ APFS.")
(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 @@ APFS.")
("pkg-config" ,pkg-config)))
(inputs
`(("eudev" ,eudev)
+ ("kmod-runtime" ,kmod)
("libaio" ,libaio)
("libtirpc" ,libtirpc)
("nfs-utils" ,nfs-utils)