From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id lQnhKbrZdGSWTgAASxT56A (envelope-from ) for ; Mon, 29 May 2023 18:58:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uNHjKLrZdGTmDwEAauVa8A (envelope-from ) for ; Mon, 29 May 2023 18:58:34 +0200 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 2B20D35E85 for ; Mon, 29 May 2023 18:58:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3gC8-00025q-LR; Mon, 29 May 2023 12:58:08 -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 1q3gC3-00025S-Bs for guix-patches@gnu.org; Mon, 29 May 2023 12:58:03 -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 1q3gC3-0005si-3h for guix-patches@gnu.org; Mon, 29 May 2023 12:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3gC2-0001aF-WB for guix-patches@gnu.org; Mon, 29 May 2023 12:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v4 2/2] 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: Mon, 29 May 2023 16:58: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.16853794546043 (code B ref 63508); Mon, 29 May 2023 16:58:02 +0000 Received: (at 63508) by debbugs.gnu.org; 29 May 2023 16:57:34 +0000 Received: from localhost ([127.0.0.1]:59025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBa-0001ZP-8K for submit@debbugs.gnu.org; Mon, 29 May 2023 12:57:34 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:49068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBV-0001Yy-KR for 63508@debbugs.gnu.org; Mon, 29 May 2023 12:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=4L12ZmZoA0lQhr2 2HLtIQCB80Neo6GXwex5Bo85i3PE=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=rX+B1/KAEWIUhGCO2rzAT2K9a+anT0gEtop2penF EBsFbIyAvyMH07fNcaprllO8etyqpLNOIaiRkK/ulAdqKqDWxZZCF9fYI2kB6qUNM8gcTg KZ2fzzj+HyZtKp9Q8Ep1GZ4SECKaRr4oxu59Wyup12oE5XkuzXHuxplvYrVf0= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id db8d1774 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 May 2023 16:57:27 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 81cf9d46; Mon, 29 May 2023 16:57:27 +0000 (UTC) Date: Mon, 29 May 2023 09:57:23 -0700 Message-Id: <2d51ddd4e6865a40a15b8f7948d2479952571a4e.1685379443.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685379514; a=rsa-sha256; cv=none; b=XEH9Y9xkuY3BAtxOiSS/ANWu3koxNcTlL1kmUiL/f5bXMw8Mj3LKH4Y4CxsLVfRSO5I52t +OLq0p3irGqUhVlG3PhnRZoMlIRIM5KAYb7aiY1fgQtJnJKKHef/y42d1l59JvTx8BLQvd cgQwowWyJYWQRWlNtADQhd+pByvUG0KxX4pzawRYAQQbVzXt77Esa3YodBnNmzMMEBJA73 Uw7z0/K7/23VhLdWnzwSw3x00MXTtFb1mOyMVkdQwwjuC5tuXIAEukE806NQd78hAKAjze zs9tUwU5ZACpedW/FB/EhTi3QtDlVQdwgeYHWPJtd1HIgoys3LtcUsXIH9Qi9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b="rX+B1/KA"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685379514; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rAmeHwFcLn8J/OmHXiHrFj7lnHdYb4fRaFMkXC4NzWM=; b=bExoYvVbrT6cMTsbGL6qj61TbOwg+0PjpzMq0ecskC1rKYaCMObzEJuMIDHfSqmUXwNfHM 5XGaXzdmCp3P29GmmiBZ9QNIeU+QV05Tixz5ZmYu7y77GQRB6Oiu8s4HFDKNP6Z+CI6eob Ce6AS3j+ngN3R5VKHvh48rvOB0NLg8+X6TW04YdFIZMUVQSxV/rxeelMPhUj+4Vn3nAgtm ch8JcCzhX9g4oQb7rzFUkJ0EF7q3zcbYJMyjUdQGuILPtJ1I9LVyeQU/T8ZBzdhJ9ZB9id QQZtNlEwPo3+sfmdLRpu4ss3cJMURjCybeLF5NoD1u84kMAL7W6x6e3IxLM8Wg== X-Migadu-Spam-Score: -2.11 X-Spam-Score: -2.11 X-Migadu-Queue-Id: 2B20D35E85 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b="rX+B1/KA"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: Z9kqx2+LGw+4 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 7a365e2e22..55255e576e 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" -- 2.40.1