me
/
guix
Archived
1
0
Fork 0
Code

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>
master
raid5atemyhomework 2021-01-08 05:31:17 +00:00 committed by Efraim Flashner
parent c64adff4c6
commit 849e3dd043
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/file-systems.scm
View File

@ -885,7 +885,8 @@ APFS.")
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(src (assoc-ref outputs "src")) (src (assoc-ref outputs "src"))
(util-linux (assoc-ref inputs "util-linux")) (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" (substitute* "contrib/Makefile.in"
;; This is not configurable nor is its hard-coded /usr prefix. ;; This is not configurable nor is its hard-coded /usr prefix.
((" initramfs") "")) ((" initramfs") ""))
@ -915,7 +916,9 @@ APFS.")
(substitute* "contrib/pyzfs/Makefile.in" (substitute* "contrib/pyzfs/Makefile.in"
((".*install-lib.*") "")) ((".*install-lib.*") ""))
(substitute* '("Makefile.am" "Makefile.in") (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)) #t))
(replace 'build (replace 'build
(lambda _ (invoke "make"))) (lambda _ (invoke "make")))
@ -939,6 +942,7 @@ APFS.")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
("kmod-runtime" ,kmod)
("libaio" ,libaio) ("libaio" ,libaio)
("libtirpc" ,libtirpc) ("libtirpc" ,libtirpc)
("nfs-utils" ,nfs-utils) ("nfs-utils" ,nfs-utils)