From patchwork Thu May 18 00:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50081 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C8E4C27BBEA; Thu, 18 May 2023 01:54:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9152327BBE9 for ; Thu, 18 May 2023 01:54:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzRu9-0000AP-J1; Wed, 17 May 2023 20:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzRu8-00009G-84 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzRu8-00026m-0M for guix-patches@gnu.org; Wed, 17 May 2023 20:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzRu7-0006i7-S8 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v2 4/4] gnu: eudev: Have udevadm look in /etc/udev/rules.d. (Closes: #63508) Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 00:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Liliana Marie Prikler , Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.168437119125713 (code B ref 63508); Thu, 18 May 2023 00:54:03 +0000 Received: (at 63508) by debbugs.gnu.org; 18 May 2023 00:53:11 +0000 Received: from localhost ([127.0.0.1]:51504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtG-0006gd-P6 for submit@debbugs.gnu.org; Wed, 17 May 2023 20:53:11 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:57944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtA-0006fX-WF for 63508@debbugs.gnu.org; Wed, 17 May 2023 20:53:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=Fnqk/wYXfLS/fcx Qyc8JKVGWZckJcEy+rbWZL3R4B1U=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=Qjr56EczfLaaGvWiP1+RcZJLnUznZDz9ALJicmrZ ehz0IGJ72lhVyOJQQ87S6A2ukLooTzKyrxjj1kv//kfxPuIPgA2xSN1AZcgS1Vf1pFYfKH 0V9LRFmYdozZvHNk9WkE+CNh5vEr6wErsjvuGgy6b0mb+vEd52xWS895qyaDg= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id e0539734 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 May 2023 00:53:03 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 0ac46202; Thu, 18 May 2023 00:53:03 +0000 (UTC) Date: Wed, 17 May 2023 17:52:41 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> References: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Note for Liliana (and not part of the commit message): Hi, I hope you are not offended by this patch. The one-line substitution here makes the custom rule work, as well. The enviroment variable you proposed is probably superior but the patch is relatively complex and the resulting flexibility may not be needed. Also, I retitled the bug to sidestep the controversy around the default for now. I was surprised by your opposition and think that should be a separate discussion. Thanks! This substitution ensures that udevadm sees the rules that are actually in effect for the declared operating system. It allows administrators to use the udev-rules-service for network interfaces. Some of Guix's customizations for udev rules appear to work as it is [1] but that is not true for network interfaces (which invoke udevadm for naming purposes). [2] The author uses this snippet to select MAC-based names for all network interfaces: (udev-rules-service 'net-name-mac (udev-rule "79-net-name-mac.rules" " SUBSYSTEM==\"net\", ACTION==\"add\", NAME=\"$env{ID_NET_NAME_MAC}\" "))) Without this commit, udevadm will consult the rules that were present at build time and were installed in the store). [1] https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00195.html [2] https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00192.html * gnu/packages/linux.scm (eudev): Have udevadm look in /etc/udev/rules.d. (Closes: #63508) --- gnu/packages/linux.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7b989a466c..750016d572 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4156,6 +4156,11 @@ (define-public eudev (list #:phases #~(modify-phases %standard-phases + (add-before 'bootstrap 'hardcode-runtime-rules-dir + (lambda _ + (use-modules (ice-9 regex)) + (substitute* "src/udev/Makefile.am" + (((regexp-quote "$(udevrulesdir)")) "/etc/udev/rules.d")))) (add-before 'bootstrap 'patch-file-names (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "man/make.sh"