From patchwork Sun May 28 23:28:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50404 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 C326327BBE2; Mon, 29 May 2023 00:29:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 164A827BBE9 for ; Mon, 29 May 2023 00:29:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Pou-0003Wx-Ad; Sun, 28 May 2023 19:29:04 -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 1q3Pos-0003WH-P3 for guix-patches@gnu.org; Sun, 28 May 2023 19:29:02 -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 1q3Pos-0008N7-HW for guix-patches@gnu.org; Sun, 28 May 2023 19:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3Pos-0006QE-DE for guix-patches@gnu.org; Sun, 28 May 2023 19:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v3 3/3] 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: Sun, 28 May 2023 23:29:02 +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.168531652624644 (code B ref 63508); Sun, 28 May 2023 23:29:02 +0000 Received: (at 63508) by debbugs.gnu.org; 28 May 2023 23:28:46 +0000 Received: from localhost ([127.0.0.1]:56266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3PoY-0006PM-IU for submit@debbugs.gnu.org; Sun, 28 May 2023 19:28:45 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:58770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3PoQ-0006Oe-RN for 63508@debbugs.gnu.org; Sun, 28 May 2023 19:28:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=rvuSDwOb1nM9sop TvUP85QLhEKeLTgbJ5fYKTjnRx8Y=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=a5c8E1KD51fSfuIh/ppn44HqakjlGHaoakRirH7z cSXTUP9SlqTrmqqbo7jBp+/PdKE8G9cPbCdtCJET/H/06yuxAF5xDU8gK6CRvVBs5L5v/t ymImqG6HtUcPZ5Y4NIGTGJd90rG1fVtdYuQ6s8Uo7O9ys7zVEHh+YGRVhKH8g= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 5f35fead (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 28 May 2023 23:28:34 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bcd3a943; Sun, 28 May 2023 23:28:33 +0000 (UTC) Date: Sun, 28 May 2023 16:28:22 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <475e3d003e5a1edf2d57e61466aa646db0ad7ebc.1685316502.git.felix.lechner@lease-up.com> References: <475e3d003e5a1edf2d57e61466aa646db0ad7ebc.1685316502.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 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] 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 90a44a518d..57b722d97d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4192,6 +4192,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"