From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6GPKL2fu919DBQAA0tVLHw (envelope-from ) for ; Fri, 08 Jan 2021 05:32:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6E+SK2fu918gdAAAbx9fmQ (envelope-from ) for ; Fri, 08 Jan 2021 05:32:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4347B9403E6 for ; Fri, 8 Jan 2021 05:32:23 +0000 (UTC) Received: from localhost ([::1]:44044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxkNq-0005Gq-3Z for larch@yhetil.org; Fri, 08 Jan 2021 00:32:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxkNW-0005GT-SO for guix-patches@gnu.org; Fri, 08 Jan 2021 00:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxkNW-0000rI-7k for guix-patches@gnu.org; Fri, 08 Jan 2021 00:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kxkNW-0008Qc-22 for guix-patches@gnu.org; Fri, 08 Jan 2021 00:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45723] [PATCH] gnu: Correct ZFS udev rules. Resent-From: raid5atemyhomework Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jan 2021 05:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45723@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.161008389332358 (code B ref -1); Fri, 08 Jan 2021 05:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jan 2021 05:31:33 +0000 Received: from localhost ([127.0.0.1]:49055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxkN3-0008Po-2N for submit@debbugs.gnu.org; Fri, 08 Jan 2021 00:31:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:38152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxkMy-0008Pe-M9 for submit@debbugs.gnu.org; Fri, 08 Jan 2021 00:31:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxkMy-0005CS-CK for guix-patches@gnu.org; Fri, 08 Jan 2021 00:31:28 -0500 Received: from mail-40137.protonmail.ch ([185.70.40.137]:52325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxkMu-0000Zx-Us for guix-patches@gnu.org; Fri, 08 Jan 2021 00:31:27 -0500 Date: Fri, 08 Jan 2021 05:31:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1610083882; bh=gjP9Ozdu8FCdnc2iAMlirOeluEivno/YBbdybzfCBJc=; h=Date:To:From:Reply-To:Subject:From; b=GBnIuOKekE87C9oRJxEzHO7Thlasa3XF94l1J6pmM4P6+FzSBPyROOl8XsNp1jinA oCl+BNeUAL5+ti90YB79a5LJX0D24/iwdxcBxx6mrQssvW+LeXblyXIuC3OiiGEAIq isCVaeo24xSdEobIgluucuqNn9NzGS5rA6ysXCUM= Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.137; envelope-from=raid5atemyhomework@protonmail.com; helo=mail-40137.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: raid5atemyhomework , raid5atemyhomework via Guix-patches From: raid5atemyhomework via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=protonmail.com header.s=protonmail header.b=GBnIuOKe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4347B9403E6 X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: vWesjoqLApAL So ZFS has some udev rules, except one of them uses `/sbin/modprobe`, so we= need to substitute it with an appropriate `modprobe`. Slowly and surely ZFS is coming to Guix... >From 14322771ca333ff269f67cc41c4dcff8809da03b Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Fri, 8 Jan 2021 13:11:53 +0800 Subject: [PATCH] gnu: Correct ZFS udev rules. * gnu/packages/file-systems.scm (zfs): Add substitutions for /sbin/modprobe in udev rules. --- gnu/packages/file-systems.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 2c5ad95d63..f74d519b33 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 pr= efix. ((" 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"))) @@ -947,7 +950,8 @@ APFS.") ("python-cffi" ,python-cffi) ("util-linux" ,util-linux) ("util-linux:lib" ,util-linux "lib") - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("kmod-runtime" ,kmod))) (home-page "https://zfsonlinux.org/") (synopsis "Native ZFS on Linux") (description -- 2.30.0