From unknown Thu Aug 14 21:22:08 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#75145 <75145@debbugs.gnu.org> To: bug#75145 <75145@debbugs.gnu.org> Subject: Status: [PATCH] services: NetworkManager: configuration-directory Reply-To: bug#75145 <75145@debbugs.gnu.org> Date: Fri, 15 Aug 2025 04:22:08 +0000 retitle 75145 [PATCH] services: NetworkManager: configuration-directory reassign 75145 guix-patches submitter 75145 45mg <45mg.writes@gmail.com> severity 75145 normal tag 75145 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 13:22:02 2024 Received: (at submit) by debbugs.gnu.org; 27 Dec 2024 18:22:03 +0000 Received: from localhost ([127.0.0.1]:47539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tREyI-0007Xx-4H for submit@debbugs.gnu.org; Fri, 27 Dec 2024 13:22:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:33404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tREyF-0007Xf-Vn for submit@debbugs.gnu.org; Fri, 27 Dec 2024 13:22:01 -0500 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 <45mg.writes@gmail.com>) id 1tREyF-0001Hj-Hq for guix-patches@gnu.org; Fri, 27 Dec 2024 13:21:59 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <45mg.writes@gmail.com>) id 1tREyD-0004AX-UJ for guix-patches@gnu.org; Fri, 27 Dec 2024 13:21:59 -0500 Received: by mail-pj1-x1044.google.com with SMTP id 98e67ed59e1d1-2eed82ca5b4so9033604a91.2 for ; Fri, 27 Dec 2024 10:21:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735323716; x=1735928516; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VaV4EmBrSZW7gc4po/j83a1GlylfDnCwRZfQ1ee8NKA=; b=Ks/VW+r38vHSTUsTJpBUhfRm6bxwGNWEWef3f06vSNRP1dev4j7OteESQCYuILbf2D pW2A69X6uD5IBsNOIn9XNV/gsBjM8q+h1uyUePrhwLfXk17LbOIdjlcHYz4XoQX2mt0h 5GevROGY8dT2xBF/odIMSYAbhOt8z3XDmCU4O8Fp4w99OEXHT651ub12y/Em4A6GybnU RzH2VpKy3NMFgZ6SLTd9lyA35qBL4v6B5EwhYgczwPMcnCPZJEYlAHHNVZ4EEz/Rh1aM cP0QZjryEy3HIZXr4xi+z6FDdWefXyjhN4gbRm8fDsCbzdImosW9HWSnxl2hQeRrlKzR jfHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735323716; x=1735928516; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VaV4EmBrSZW7gc4po/j83a1GlylfDnCwRZfQ1ee8NKA=; b=Zj7nUOchyr4STXD3U1gPgpSmQvrtBnWAlnpEYT58GiR+E4ud4Tjkkniuvg7SED2jHM bhTnriPuGUiZMnDuMtfEYcycIYYDweZi5BK36DRjThRy+xz3U7tdHd+PqZNFnqzH4EJJ fIuZPFIvtSukznsCPvzipv+4bdsxSoYOl+aOArHIuvQHKBA4F+omPGpgenakjcTqPR0S x2Fgk0yq2LPBEYVL1LouxWqD7oayOkHLuUUMT+meMRMIEziUSjcH0PtS1XCb+VRQvhpS YGWi1to+e4VbYimOGAmYbQjPDFzH/ShLsYPKfersv4tX7a07NEbZu/rvFBZf9nx/tDfj uLFw== X-Gm-Message-State: AOJu0YxQc1PpQTkV5Mo4bK7r3NK1/a9WNDV7nvIGlzIb6rF6ez37xsBB 3ySb9SxVFAwtk7L2IRq76VRNEWFBNijh6D/Tcj2UBZxNGTye+dm6pGJHxDHb X-Gm-Gg: ASbGnctkwtbabGwWjlV5taue7TvvuLr9z2vrE0s3KkXQF6iXzMj3bBPNFM2a1k46TzP k7VlCmz+pKW1MqYtLwvMjkEdMCgp93tcbOAICXDm6v5LKrxf9SUccSeVNu4mHxFvcBg1VS5sU37 mOIz+uz1FMtJJmWPl8P15hVcpoAjHgF9xGLAfMf9n8GP+8iCUHyXbhIAn6ydXuODszi08bB9tLY /IhHe5XKJlsf52sJE46/X71ZtBdXR4l3jVwQgqdrcE2qOG2AaEGZIEWIx4Hkq91ZWit1KgLbWaS X-Google-Smtp-Source: AGHT+IFDGilKrbjxjwDIOmJ26tmuZqNFsFFaaMR+tCpNg0Q0zE0x4Bg6oxd7c3YmpKEtpmy3LTXdlw== X-Received: by 2002:a17:90b:534b:b0:2ee:c91a:acf7 with SMTP id 98e67ed59e1d1-2f452dfccdcmr41084712a91.4.1735323716041; Fri, 27 Dec 2024 10:21:56 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1cb8:a2d3:f4aa:1246:d469:678a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9d9775sm138178965ad.148.2024.12.27.10.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 10:21:55 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: guix-patches@gnu.org Subject: [PATCH] services: NetworkManager: configuration-directory Date: Fri, 27 Dec 2024 13:18:06 -0500 Message-ID: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1044; envelope-from=45mg.writes@gmail.com; helo=mail-pj1-x1044.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Give users a way to configure NetworkManager, by specifying a directory containing configuration files. This directory will then be symlinked to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [configuration-directory]: new option. * doc/guix.texi: document it. Change-Id: I243a71593b9235cc11ebf9fea1926a1840d993d2 --- doc/guix.texi | 30 ++++++++++++++++++++++++++++++ gnu/services/networking.scm | 10 ++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index da4d2f5ebc..ee0fbf59f9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21441,6 +21441,36 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{configuration-directory} (default: @code{#f}) +A directory (file-like object) that will be symlinked as +@file{/etc/NetworkManager/conf.d}. NetworkManager will read +configuration files from this directory. For the configuration file +format, see the @command{NetworkManager.conf(5)} man page. + +For example, you could supply an existing directory: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (configuration-directory + (local-file "files/NetworkManager/conf.d" #:recursive? #t)))) +@end lisp + +Or create a directory using @code{file-union}: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (configuration-directory + (file-union "my-configuration-directory" + `(("existing-file" ,(local-file "001-basic.conf")) + ("constructed-file" ,(plain-file "002-unmanaged.conf" + "[keyfile] +unmanaged-devices=interface-name:wlo1_ap +"))))))) +@end lisp + + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 48a86b3694..7152c5a95f 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 muradm ;;; Copyright © 2024 Nigko Yerden +;;; Copyright © 2024 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1262,18 +1263,23 @@ (define-record-type* (default '())) (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) - (sanitize warn-iwd?-field-deprecation))) + (sanitize warn-iwd?-field-deprecation)) + (configuration-directory network-manager-configuration-configuration-directory ;file-like + (default #f))) (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config - (network-manager dns vpn-plugins) + (network-manager dns vpn-plugins configuration-directory) #~(begin (use-modules (guix build utils)) (mkdir-p "/etc/NetworkManager/system-connections") #$@(if (equal? dns "dnsmasq") ;; create directory to store dnsmasq lease file '((mkdir-p "/var/lib/misc")) + '()) + #$@(if configuration-directory + `((symlink ,configuration-directory "/etc/NetworkManager/conf.d")) '())))) (define (vpn-plugin-directory plugins) base-commit: 831b94a1efcea8f793afc949b5123a6235c9bb1a -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 07:25:06 2025 Received: (at 75145) by debbugs.gnu.org; 9 Jan 2025 12:25:06 +0000 Received: from localhost ([127.0.0.1]:50720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVraz-0004eW-Jf for submit@debbugs.gnu.org; Thu, 09 Jan 2025 07:25:06 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:59866) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tVrax-0004cV-NF for 75145@debbugs.gnu.org; Thu, 09 Jan 2025 07:25:04 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-2166651f752so16277545ad.3 for <75145@debbugs.gnu.org>; Thu, 09 Jan 2025 04:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736425496; x=1737030296; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B/cgCy7G+fGFfXAgXJJS5n4VhFRzUSubVkDd9T4txD4=; b=YQ35jpAeIxJICs2d1ypN7z+KcQZcPaR0gISUSGQliGTH7SupqKUbpHdtAwKq/UXQfc tuIuHu7ZNsZrskx1WM5uouF601OoazaLxptR642NTqMfsGoNJYSNRdrzTaA7nAcW/j4C AjvIKqzEBjWmFq6g4fmNuwJswsYc1H7ibvDlhwszHmQFNDfCyowhBjHikqeH7TEM1Crv HOM/4eQZfbJ4aM4aIBAEC0H2wFlAHtqk2ot7U2/tD5dBXXoNwc1oEmdZw6bA5I+nG5K5 wTV08sL0OVGJbJujra+lBMf+WM0yu8WXTcHlszYejSYB1NFrk62Dt1gzeEW9q6hW6+V4 n81w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736425496; x=1737030296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B/cgCy7G+fGFfXAgXJJS5n4VhFRzUSubVkDd9T4txD4=; b=WPQKvEF4TtSfOW3NWavqAooSeFKvt94scaQ2ppx6BxdK38NAjHP8DaMOuR2Dw/qy6A PqY39h2zs9KJBnH0eKcnZ5CJlI5eqNVU69rfkjjUQ28GV3yXXgVZ//uTxHA4Bv9Gtg/o zoK+iPovfNQPHwayS18JNLQIAqDKiF1+wmIyXIqc95K4NApHEuMt9laxXPURJh1v1NO3 XCkb6OqII3+JJ50ZdNIAE7GUh5rsJ1gUKde1C1lc2wHSkcTd+qhksdiLrs/j87SMXIlj K528962y5qDyoWmK8vzghx5GOa2ZwQX+MXwEFwl+tUwVYQ84PbPurrSEvlMnVN2ua6MH +YqA== X-Gm-Message-State: AOJu0YxrJXKcj2EDceNU4yUtsVBxXQ7cIz3uTiPyHn5k27iu7lyFop9x cII3ZK/dxK/koxeseo3uLU5ZWG1I4QtD6XsyZT1o7LoCKIZSQLaJ1NMmrbu8 X-Gm-Gg: ASbGncui4O8Q/eJ6I8JDtmw8WWIrUQiJ02nblE97PI3awnIHnVIl3gj1PndWw2086WB EGKAIEj428sPqnU38cwgMXdG8MUTcFc5v0BBJZhFCWYffPQLYyOdY1b6xTSA4jw9FcF89L+iTz9 QVapsvO+uMtqLJiSoldlTmj4pJubRDVAYwuxBYdcKJJdDFajifO4BUR51n40hdWoKtBRC1s4fiB Gq0dK3uFyzN7LGVsbvo2Rr3ljP6HoonDGG4jkQb57PSQj8dKHBQW5Dxm0iVSPYzFRAHdMCNIVal Q/c= X-Google-Smtp-Source: AGHT+IFA5/GQR1Fb4lZo608lm0Kn8BJQL759eCTkjrsi1sNLZk30SFW5oFygIZCcBUEVEQBvHw77NQ== X-Received: by 2002:a17:903:2452:b0:216:6f1e:5799 with SMTP id d9443c01a7336-21a83fe4f75mr86137445ad.35.1736425496244; Thu, 09 Jan 2025 04:24:56 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a91768814sm11496435ad.18.2025.01.09.04.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 04:24:55 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 75145@debbugs.gnu.org Subject: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. Date: Thu, 9 Jan 2025 12:24:30 +0000 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Guix, As the first revision of this patch failed to get any attention in two weeks, I'm CC'ing guix-devel on this one, hoping it'll get reviewed this time. Let me know if I should have done anything differently; I'm still relatively new to contributing. This patch allows users to specify configuration files for NetworkManager. While perhaps it would be more Guix-y to instead have a field in `network-manager-configuration` for every configuration option, this would be a monumental undertaking (look at the number of options listed in NetworkManager.conf(5)!). At any rate, I think any means of configuring NetworkManager is better than none. The difference from the first revision is that instead of specifying a single directory (file-like object) containing the configuration files (which was then symlinked to /etc/NetworkManager/conf.d), you now specify an alist mapping file names to file-like objects, like with `etc-service-type`; and those are then added to /etc/NetworkManager/conf.d. The rationale behind this change is that it doesn't rule out putting our own stuff in /etc/NetworkManager/conf.d. For example, if we wanted a default set of files in there, we could modify the procedure `network-manager-configuration-directory` to add the files supplied via the field to our default set; in the first revision, this wouldn't be possible as the user specifies the entire directory. (I don't know whether we'd ever actually want to do this, but I thought it best to leave our options open.) 45mg (1): services: network-manager: Add extra-configuration-files field. doc/guix.texi | 21 +++++++++++++++++++++ gnu/services/networking.scm | 26 ++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) base-commit: 7f27dc47c52886b785359799b6dc67b61f638544 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 07:25:17 2025 Received: (at 75145) by debbugs.gnu.org; 9 Jan 2025 12:25:17 +0000 Received: from localhost ([127.0.0.1]:50726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVrbB-0004jc-2c for submit@debbugs.gnu.org; Thu, 09 Jan 2025 07:25:17 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:56428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tVrb8-0004gf-Kk for 75145@debbugs.gnu.org; Thu, 09 Jan 2025 07:25:15 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-2163b0c09afso12687955ad.0 for <75145@debbugs.gnu.org>; Thu, 09 Jan 2025 04:25:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736425508; x=1737030308; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Af0w2rz/Vax1gn/d5cOIoCrQ68IsBq72QhtbVcKloAw=; b=dL5XSwGYN1NUACrUtIcvLq1Q42Wp1NrApbGBXbwM/WdP9mRyMZfXYTqbvQKtpmxfqe n8QrPgQXHaJTMQAm9LgBwbm9EaOiYEyyzG0xCLfyzlTDIvhuVkye/WW71RSOZ/9KHwDi XykgXc2ErpYfqWOmeXDaNnp67kxGXNsRnqiHdjodj1kAFh1g6OG7ejaz3R6taBBFM/mt oqzidQXEgKGZ6W7UMeqp34ThOxeoNRENLcAEO4mV70KoA/qmukVS/NVeDLV+d9mCb5CD +Q1S1QDHBmbpFNwZBKQKb8skeUfrOWUOxZoq5pPyfbT8TwFmqh7T0Rh7Z7r8RePZ621W zS2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736425508; x=1737030308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Af0w2rz/Vax1gn/d5cOIoCrQ68IsBq72QhtbVcKloAw=; b=tA2pJwC1hgNTV/fkAyO3m1rNOoiuxvHbdEJ2St0W4eJ11GCXtGKMOMZgUCBusspoAb L86Sl33C27pV2+4g4XpPFaRhSxlhsBA9+Py5zzJnAokxMCAPvV/jmCyfDnt9RYSrepHy FGiDJRbkre4i8W59DU0/FDPjeQQ7wXr00NwP4amMqdP7DYqRjfLyQIx0BcbGYLGx7aDv lt/X5nq26IYhRNVtvoKOwReSnNxwkLk132GZfOJqXVqs+afEcb+IDybSCD/K8H/mnaT8 fAH88sCl7sAzjvkt8JthiDk5WRJtLa5Ng2JnVJXqBFwa3o4QiF4RrlvsYjO8OLBr+KKS dvuw== X-Gm-Message-State: AOJu0Ywtc9zpuTr391fBazyKwSqcpj4fgXjagRt1SKEJcnFvqJnLfWvn t1xBb61RUzsOm8P4svNGL7nR6NsD/NPwEtzyTKnMCTQVBpyKDDbrotxfGH2I X-Gm-Gg: ASbGnctSMmIkNMoENuj65sStty8Of1ucNOzhO3YMjFzAyBLfaO2EW+v25wZKu3c0lzR SCFh78qNXW2lBAmwZGSebd4+wgTENZnvAGYgXHEEp+NkHM3sC1YITk+DRSmufOOri6eey1dpKga N7zQt0k7ZT8OIileiMoRqMK+v7FO1/NV1dqpExlFS/5nSCcp3YI82E9NUXmbjwZRemGJy5OGUHF y+CwaSJQM9MYfMkbgwJiB+BuKX5a92aDyac0tYCJ5DQesjsgBPCXKuZYbJdYkt4iLXCzrpmk7Gv hmY= X-Google-Smtp-Source: AGHT+IFOMLXsdm4h/FyGD/5ohNWgnC5XRTJg1tsO458mi6xl8BXMQxywzhwdPFFYh2SSAvnbDMDBBQ== X-Received: by 2002:a17:902:e84c:b0:215:4757:9ef3 with SMTP id d9443c01a7336-21a83f338b0mr89063095ad.9.1736425508502; Thu, 09 Jan 2025 04:25:08 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a91768814sm11496435ad.18.2025.01.09.04.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 04:25:08 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 75145@debbugs.gnu.org Subject: [PATCH v2 1/1] services: network-manager: Add extra-configuration-files field. Date: Thu, 9 Jan 2025 12:24:31 +0000 Message-ID: <6c5c3ce265d159c862de73a77e985cf30a1f30a8.1736423822.git.45mg.writes@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Allow users to specify additional configuration files for NetworkManager. These files will be added to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [extra-configuration-files]: New field. (network-manager-configuration-directory): New procedure. (network-manager-activation): Honor the new field. * doc/guix.texi (Networking Setup): Document the new field. Change-Id: I07479958e4d0aa318328c666a9630b779230b300 --- doc/guix.texi | 21 +++++++++++++++++++++ gnu/services/networking.scm | 26 ++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index caebe3b03c..279fdb838b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21455,6 +21455,27 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{extra-configuration-files} (default: @code{'()}) +An alist of file names to file-like objects, representing configuration +files which will be added to @file{/etc/NetworkManager/conf.d}. +NetworkManager will read additional configuration from this directory. +For details on configuration file precedence and the configuration file +format, see the @command{NetworkManager.conf(5)} man page. + +For example, to add two files @file{001-basic.conf} and +@file{002-unmanaged.conf}: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (extra-configuration-files + `(("existing-file" ,(local-file "001-basic.conf")) + ("constructed-file" ,(plain-file "002-unmanaged.conf" + "[keyfile] +unmanaged-devices=interface-name:wlo1_ap +")))))) +@end lisp + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 48a86b3694..4355158225 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1262,18 +1262,40 @@ (define-record-type* (default '())) (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) - (sanitize warn-iwd?-field-deprecation))) + (sanitize warn-iwd?-field-deprecation)) + (extra-configuration-files network-manager-configuration-extra-configuration-files + (default '()))) ;alist of file names to file-like objects + +(define (network-manager-configuration-directory extra-configuration-files) + "Return a directory containing EXTRA-CONFIGURATION-FILES." + (with-imported-modules (source-module-closure '((guix build utils))) + (computed-file + "network-manager-configuration-directory" + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$output) + (for-each (lambda (pair) + (let* ((filename (list-ref pair 0)) + (file (list-ref pair 1)) + (dest (string-append #$output "/" filename))) + (copy-file file dest))) + '#$extra-configuration-files))))) (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config - (network-manager dns vpn-plugins) + (network-manager dns vpn-plugins extra-configuration-files) #~(begin (use-modules (guix build utils)) (mkdir-p "/etc/NetworkManager/system-connections") #$@(if (equal? dns "dnsmasq") ;; create directory to store dnsmasq lease file '((mkdir-p "/var/lib/misc")) + '()) + #$@(if extra-configuration-files + `((symlink + ,(network-manager-configuration-directory extra-configuration-files) + "/etc/NetworkManager/conf.d")) '())))) (define (vpn-plugin-directory plugins) -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 09:44:54 2025 Received: (at 75145) by debbugs.gnu.org; 9 Jan 2025 14:44:54 +0000 Received: from localhost ([127.0.0.1]:51335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVtmH-0003RY-EU for submit@debbugs.gnu.org; Thu, 09 Jan 2025 09:44:53 -0500 Received: from nanein.fr ([185.230.78.41]:58536) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVtmE-0003RA-LT for 75145@debbugs.gnu.org; Thu, 09 Jan 2025 09:44:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1736433883; bh=P3fcGZNuIlX5sqBoC/5o0/aQAwDc/hkQgHCH7TjGqFY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=u3PbmPU+YZqb2tJQPcktLhwmX7sRyO26aIA2d1o1duTCgOasHhhPC+5skKkbT8FM5 9t63OFj08KMihM0JKkGjjGhVFvuHv7eX4d+W/SjTpa5IK2FEZzih9wJSjFzfnzm7Wg 2f1Ho/XIsUzN+XMVgvuxvv74v59pv0Q11SM3U9co8eslYoLEt7V1O9xKpOBjJdSAmk FwryMha0B/NO6fx8+KTBUekT6rhnKO2naIUh+cVABw1LURy+XxN23/g4nSaoSVQwdR Tq5wlplnNCzc9bxjDjjJlt+PDiQwv3+rspa4FdwwSudJ3cxJLAP72dohOQmt42AGkw PXmsnEcHYQYkGfooV+/tKCnFKUmrOrJJGpJccOJ7zaq2d57iraAGNExnwmI1szl200 tUE2Pps/haWRQWq7nwB82PrCHpJ4dQdFqnXV008QJQNj7LRB1Am/WQ7lNpnh+iL8oG VjNGCpR1UEesn5WGSC6VdWSCG5IU+6lGeDtTXOo/dvmeDHByc3PO9qo6qZllGpjwgU 5UVWHehTllC3lG5yRD2CXWFqA0dEr73kz6wb1elYZNWdqU/IDCCwdCvsOcPWDEsZcA IAsiLQKw05Mrk9ndvw+LomjJfcuh+Wv55C1actT0IG5mZgMaxwX9kz5vOvkncmCb3j SaJntCKmlyshPj+CHQkb2szI= Received: from cochea (eduroam09.au.dk [185.45.22.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 194791401EC; Thu, 9 Jan 2025 15:44:43 +0100 (CET) From: Arnaud Daby-Seesaram To: 45mg <45mg.writes@gmail.com> Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: (45mg.writes@gmail.com's message of "Thu, 9 Jan 2025 12:24:30 +0000") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Thu, 09 Jan 2025 15:44:27 +0100 Message-ID: <875xmo11ys.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Thank you for your patch. 45mg <45mg.writes@gmail.com> writes: > As the first revision of this patch failed to get any attention in two we= eks, > I'm CC'ing guix-devel on this one, hoping it'll get reviewed this time. L= et me > know if I should have done anything differently; I'm still relatively new= to > contributing. I am also new to contributing, so the following may not be fully accurate. I think that you did everything right. Unfortunately, some patches "fall through the cracks". I have seen some people replying to issues=C2=A0[0], so that emails would show up in people' mailboxes (similar to what you did) and restart the discussion. I think that it is also possible to suggest simple patches for patch review events [1]. I do not know if proposing one's own patches is frowned upon or not, but I would not expect it to be as long as there is no abuse. [0] Random example: https://issues.guix.gnu.org/64620#21 [1] Wiki page for last year: https://libreplanet.org/wiki/Group:Guix/PatchReviewSessions2024 > This patch allows users to specify configuration files for NetworkManager. > While perhaps it would be more Guix-y to instead have a field in > `network-manager-configuration` for every configuration option, this woul= d be > a monumental undertaking (look at the number of options listed in > NetworkManager.conf(5)!). At any rate, I think any means of configuring > NetworkManager is better than none. I agree that an escape hatch enabling to configure NetworkManager would be nice indeed. > The difference from the first revision is that instead of specifying a si= ngle > directory (file-like object) containing the configuration files (which was > then symlinked to /etc/NetworkManager/conf.d), you now specify an alist > mapping file names to file-like objects, like with `etc-service-type`; and > those are then added to /etc/NetworkManager/conf.d. The rationale behind = this > change is that it doesn't rule out putting our own stuff in > /etc/NetworkManager/conf.d. For example, if we wanted a default set of fi= les > in there, we could modify the procedure > `network-manager-configuration-directory` to add the files supplied via t= he > field to our default set; in the first revision, this wouldn't be possibl= e as > the user specifies the entire directory. (I don't know whether we'd ever > actually want to do this, but I thought it best to leave our options open= .) On adding default files in .../conf.d/: ``````````````````````````````````````` Adding a default configuration could one day be interesting. However, I=C2=A0would rather (personal opinion) see the default value in an exported variable %default-networkmanager-files (non-contractual name) if needed. This variable could become the default value of the field. This way, it would be more transparent to users, and would enable them to easily opt-out. Adding their files could be done with the following configuration: =2D-8<---------------cut here---------------start------------->8--- (extra-configuration-files (cons* `("file1" ,(plain-file ...)) ... %default-networkmanager-files)) =2D-8<---------------cut here---------------end--------------->8--- On doing a similar job than `etc-service-type': ``````````````````````````````````````````````` As you said, you are doing something similar to `etc-service-type'. Is there a reason not to extend [2] it directly (e.g.=C2=A0like `greetd-service-type' does in `(gnu services base)')? You could, for example, prepend "NetworkManager/conf.d/" to file names and pass the value to `etc-service-type'. WDYT? [2] more on service extension can be found in (guix)Service Reference: https://guix.gnu.org/manual/devel/en/html_node/Service-Reference.html Final thought: `````````````` Would it make sense to allow the NetworkManager service to be extended? (E.g to allow another service to add a configuration file.) Note: this is not a blocker for your patch and could be done in a later patch. It is simply a thought that I wanted to share. Best regards, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmd/4MsQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDE/rD/9vIUKmRubYnKSkm6VZL41gBsjjozwBkpbS yo4GX8zD0mrrIfeyZcWkLj5VgUGWkElN+6WV0EM4Q71dAoAbi6NrhMlAY1cv4M9z V+6bHnF0kK7HeM/kRq2dr57E4NXNbwfZ8ysuohiXzHmDiM08xVSKcfUO69S17w8I A52SLgsdHRGQXE8ru4OuqSBahZNCTd3E+/fe73E+loRzXO9IlTCWkLsYzc1GUHY/ gfqThda3mTh/VkS6+2cINA/fDzNx3v4kJWzPMsg+00WaPwp5AP322JoGMo8TIX7d +y41Fy4PZdLlRGss3gk/ZndPLmdN1RRg6v2ohTahzRfQId8n+ypfqicf3Gp8sS8K lj2u2fvDcdHNQr+M6xd9DPLWFKn2okLEVS+/6mdmIGtMVdgUcazdp35rpfk9zEVg Dc/EQkoq7TA9hJycJN3Oevwt2n9L8BntdhhYMF6EBzWa9jSp4GmNGDxlHHeSlBOJ thQdzZH1hY2UESP6w7N1Z0FmVo4eII19aHfyybvgsoAFg00cwstECFj9ZFHRGVlz 108jfrorXAR7loXG7Yrl1uXw34/sUM1dRt8qoN3YNWYI88sMYt1QfVCm8j7zuRAa f4btbZCI7+ntDPwwffHSYFZs5cyo/SOdhX7XVexz7BOCeZtPP0loLCd3lPsRFo2I 0pQCYc0vlg== =ucdW -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 12:03:31 2025 Received: (at 75145) by debbugs.gnu.org; 9 Jan 2025 17:03:31 +0000 Received: from localhost ([127.0.0.1]:54067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVvwQ-0002b0-VI for submit@debbugs.gnu.org; Thu, 09 Jan 2025 12:03:31 -0500 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:47301) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tVvwO-0002af-Ig for 75145@debbugs.gnu.org; Thu, 09 Jan 2025 12:03:29 -0500 Received: by mail-pj1-x1041.google.com with SMTP id 98e67ed59e1d1-2f43da61ba9so1587364a91.2 for <75145@debbugs.gnu.org>; Thu, 09 Jan 2025 09:03:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736442202; x=1737047002; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Af0dWIk9laaEL3ETaob4BC+44JiUe0zN2G8oUW/INok=; b=YdMeflqBkYOYLpsUArj8kTpMMTmQw/9Oy9CRw1vDvzaNqaNNPeqH43aJ7+tv39yhJr D6Wt+Yr19P5NsS7IcowY6X7yEzTlF5tTwFl1P1KjRUzrKiDsYY15+gmIbm1xQre61L/v ucK+aXQw+5QRLmkS1nTejg8f0Ineyhw5Myv64uQ0clCM3Gp0aRo2kDgDyysOBHGRwOY8 nfotMC+VSt5zvsfI7N/Cq3rsuvmWNUELU61lMzWYfOTr34LIWAecfaG/yyRdWbiocjZ6 gkFoFZ8N2LUn3VYWz0tsEYFoOKpzei6VzsBJlUCSaEA6ZVYEdTxOmQXNxf1CLjdd87Im H11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736442202; x=1737047002; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Af0dWIk9laaEL3ETaob4BC+44JiUe0zN2G8oUW/INok=; b=RJckiLDSNf3xqVRDMcxs++36LN+PRyzwS4GEPMwXoR467ofWJ4jr5ZH50pdcZnmWZj gR/yPjo5f0BQTPIDU14RvGKswyPr69ZaPlmym4i4/t2J47k2WTaIShLfSR1Jdu5+dNtZ rK2pCpIFeEfdMhK7POS2K5D+PdpLGjSf627OBxonG/UzrQB1pFF4B1G1IwYKTM0N/tf1 W/9NqcVZAgwHFEz842FhEE1m0V5z0oh6r+5+TaJ7QeaKrPkyR3eoXH0SL4g2cEx/OIEb ygQUT+XgiyMvawwmsYDysH3fDLnkZSIr0se7UlA5d+xDDHwCR6fjz04Tb1XErfY9rqGW Tfag== X-Gm-Message-State: AOJu0YyyowqnJMhF3YZtm2YSUoyowSDOmwoFMPATWEPry2q5BhU4wNT+ D+e0iIGtYs2ZgMJM9PrXtW3FZrfcurTVV5u7e5CTnx4RUk0hlRan X-Gm-Gg: ASbGncs4siFjIW3MXH3bjmpJhpyGa0lcJPjRUJ08aoWC1j7R/AIkTvcG9eF4yYpntbZ zEeODT/+g77YkfMbJ18fGytx01HxO7+zG9b8HdlyISi0M1vgE4QQoTuIhA2K6W+5byOZQ2XXjRP XhuDekGUrEbNQkJaFyTOpF2EGku76bplsgQasgbSU4uSez/OzZYmTEPdBpWFLFa5hrVSe4aSCH9 sMxxTnd80mWYh3KhpOX+25d19XjhW6zZL9vO3DnLWcTJAspPMyRzaeE1g== X-Google-Smtp-Source: AGHT+IGFsHin18QOUVsNZWfJRAAjarqsXJ7titOvO1S/b2UsXazF3u8zHBMXvUvxbMT9xJA8crSBlw== X-Received: by 2002:a17:90b:4d0c:b0:2ee:8619:210b with SMTP id 98e67ed59e1d1-2f5490bd21dmr11050861a91.29.1736442201958; Thu, 09 Jan 2025 09:03:21 -0800 (PST) Received: from guix0 (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f5593d08a8sm1802511a91.9.2025.01.09.09.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 09:03:21 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: Arnaud Daby-Seesaram , 45mg <45mg.writes@gmail.com> Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <875xmo11ys.fsf@nanein.fr> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <875xmo11ys.fsf@nanein.fr> Date: Thu, 09 Jan 2025 12:03:13 -0500 Message-ID: <87jzb3zzqm.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Arnaud! Arnaud Daby-Seesaram writes: > Adding a default configuration could one day be interesting. However, > I=C2=A0would rather (personal opinion) see the default value in an export= ed > variable %default-networkmanager-files (non-contractual name) if needed. > This variable could become the default value of the field. > > This way, it would be more transparent to users, and would enable them > to easily opt-out. Adding their files could be done with the following > configuration: > > --8<---------------cut here---------------start------------->8--- > (extra-configuration-files > (cons* `("file1" ,(plain-file ...)) > ... > %default-networkmanager-files)) > --8<---------------cut here---------------end--------------->8--- Yes, I think I agree. Of course, it's a moot point for now since we don't have any use for such a variable yet, but it seems like a good approach. > As you said, you are doing something similar to `etc-service-type'. Is > there a reason not to extend [2] it directly (e.g.=C2=A0like > `greetd-service-type' does in `(gnu services base)')? > > You could, for example, prepend "NetworkManager/conf.d/" to file names > and pass the value to `etc-service-type'. WDYT? That's a good suggestion! I don't know why it didn't occur to me. So I tried it; the problem is that if I pass something like this: --8<---------------cut here---------------start------------->8--- (service-extension etc-service-type (lambda (config) `(("NetworkManager/conf.d" ,(network-manager-configuration-directory config)))= )) --8<---------------cut here---------------end--------------->8--- ...then I get this error when creating a container: --8<---------------cut here---------------start------------->8--- ERROR: In procedure primitive-load: In procedure mkdir: Read-only file system --8<---------------cut here---------------end--------------->8--- It looks like this is because of this line in `network-manager-activation`: --8<---------------cut here---------------start------------->8--- (mkdir-p "/etc/NetworkManager/system-connections") --8<---------------cut here---------------end--------------->8--- When we use `etc-service-type`, "/etc/NetworkManager" becomes a symlink to "/etc/static/NetworkManager"; and "/etc/static" is a symlink to the result of building the derivation returned by `etc-entry` (see (gnu services)). And derivations are in the store, which is read-only. So we can't create "/etc/NetworkManager/system-connections/". And this won't do, since NetworkManager itself needs to be able to write to that directory to manage saved connections. So it looks like that won't work. > Would it make sense to allow the NetworkManager service to be extended? > (E.g to allow another service to add a configuration file.) > > Note: this is not a blocker for your patch and could be done in a later > patch. It is simply a thought that I wanted to share. Yeah, this was another reason for this revision. Again, it's not actually something we need right now; it's just worth leaving open as a possibility. From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 09 14:34:23 2025 Received: (at 75145) by debbugs.gnu.org; 9 Jan 2025 19:34:23 +0000 Received: from localhost ([127.0.0.1]:54311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVyIQ-00016f-Ue for submit@debbugs.gnu.org; Thu, 09 Jan 2025 14:34:23 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:36440) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVyIP-00016S-5I for 75145@debbugs.gnu.org; Thu, 09 Jan 2025 14:34:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=v1FZJ5LjbLMRfBa O0n8niDCQH3jS5ML+PisbzIgVius=; h=date:references:in-reply-to:subject: cc:to:from; d=lease-up.com; b=U2I8SQYjzqyp8ywjIfiwedVPQjulZVVLKPGhfy7q hxYCFh2dibAFQY6vatgrcfN/mG86kiakhWWCKlUAzFmci9CLdlbhPWQwsUjMPbHdBnsbFa a1A1mzqsh4hIioi/49iCpE+98yUusO7N84M7e1tlTVSr8N55D8QkDqrvNp5c4= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id e78882a7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 9 Jan 2025 19:34:12 +0000 (UTC) From: Felix Lechner To: 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: (45mg.writes@gmail.com's message of "Thu, 9 Jan 2025 12:24:30 +0000") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Thu, 09 Jan 2025 11:34:12 -0800 Message-ID: <87seprdbnv.fsf@lease-up.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi 45mg, On Thu, Jan 09 2025, 45mg wrote: > this patch failed to get any attention in two weeks Two weeks isn't a long time in free software projects. A more common time frame would be between one year and eighteen months. > I'm CC'ing guix-devel on this one Pings are generally frowned upon, but I also just did it yesterday. [1] Pings are usually not worth it anywhere, not just in GNU Guix. Pings are likely to be ineffective in hastening the acceptance of your patch but will almost certainly affect your social relationships negatively. > This patch allows users to specify configuration files for NetworkManager. If you require that change personally, as I suspect you do, my recommendation would be to clone the Guix repo and pull your 'guix' executable from your custom branch. For example, I have in my channels.scm a branch that I rebase periodically. [2] I pull with guix pull --allow-downgrades --disable-authentication That kind of setup totally removes the timing pressure from your contribution. It also allows you to test your patch in real life and then argue with committers solely about its merits. It's better for everybody, I think. It may leave everyone, most importantly yourself, in a happier place. Kind regards Felix [1] https://lists.gnu.org/archive/html/guix-devel/2025-01/msg00056.html [2] https://codeberg.org/lechner/guix-config/src/branch/history/channels.scm From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 12 12:44:17 2025 Received: (at 75145) by debbugs.gnu.org; 12 Jan 2025 17:44:17 +0000 Received: from localhost ([127.0.0.1]:48961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tX20X-0001WL-2T for submit@debbugs.gnu.org; Sun, 12 Jan 2025 12:44:17 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:50286) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tX20T-0001Vu-Qs for 75145@debbugs.gnu.org; Sun, 12 Jan 2025 12:44:15 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-216426b0865so59765105ad.0 for <75145@debbugs.gnu.org>; Sun, 12 Jan 2025 09:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736703848; x=1737308648; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zz6nBajFUCQWxo5xYjKRRRDF+vPA9J6XLraLgGrsvjo=; b=at7r+EjUFrcnwcEOmTabynDN4uitnb9+9dxY4levv8YZeifVPeQHFPK0AvnFpvvqD0 EoKikeuLvoh7zbSJU5oohjcA6phpqdaK+Iz/I9XOYVVAgYSqyGz04WCHlYpQR9YeVu+J 9Z0MmUf9GclblyP380J85Dz29GP9fgxG2omCZ5uyM5L6xW1p5UN6LH+MMHRxfQ/IvyKO hfsigwdwQ+bHu0t/LgoiXu8RyULsl6F1afaIWyMuviHnvM7Gm+yDX2Tlj8MEG6O1F816 kElcjTHRANq8td37FQuliTSqWdtjd6wz8NMOGmm+3nRqqWY0vkXprvADfld6uOIoPFw5 kFrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736703848; x=1737308648; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zz6nBajFUCQWxo5xYjKRRRDF+vPA9J6XLraLgGrsvjo=; b=KNi2GAXecE39vba2bntnwtpU6mlPH7dIs5BttZ3F4kWzEbJzl+FsiXq591xA/MCwJe 4C6A/q7asSMtLAlTpCQo2CSSbVsmeKAkoyaho5a9Vr5hvna6rRcAJ5kOvQ2MCB06Z0tc emISzQAUQKSOlB3blKQgOvjW5xRc/uE5ZUyXkmXV/ocMpme3We2s4YSXU7AEICeCpCkR QzBEQ/B8CRsPilkrPtx8fBJunniqaTkqK5D7MT2qcagAqsMVZEabpnrA5UvkIBedvfiw kyzpFrnP1CidON858mRRsI6t5Ng0/D5u8M/fqE/nrM5nb3wySH/ERAleE3fW53NCA6ze eziw== X-Gm-Message-State: AOJu0Yx6t0bvWs5FvHUkdGizbFIYoD0cWvaP6Ra2ipDBH2TAicy8C3yI MNdOWnXNAWeXvDQDYhihx7gBOocCptCwK5vYgEmxu8ddUZUWmQDO X-Gm-Gg: ASbGnct66zVNcTzcqxmyVTBd3svS0UxVY+202kWI/V9Y6H/pIBVPevieUwXuXPi9Kok aS1DTPl6kVc0ldblpk1f7+MSpsVK5ntwZyv7SJyOaEhwQnPyzPEWxtv8loYzB07fEXOWk6ab18K TRoLX4LsI3j5RD/v3jgQt6f0Xl9qwqI6w4jiY8b2dWExKUhNu7NamH+ZiCF9F7J9zArM8fiwQui 8Iunjf5S6SAYlCFKC6pEMBbWS8ApBvFdAJ7ZBqgLDEJuhbtDDcphlqg4A== X-Google-Smtp-Source: AGHT+IH5v5oVhcsqNNbNBL8rSgFSU5b0vdiZ76KOjRg4+C3TrNOoXXnrulIkp87aqGpeSGbY44M+SA== X-Received: by 2002:a05:6a00:392a:b0:725:b347:c3cc with SMTP id d2e1a72fcca58-72d2200273bmr25540560b3a.23.1736703846180; Sun, 12 Jan 2025 09:44:06 -0800 (PST) Received: from guix1 (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d40658cd0sm4484175b3a.113.2025.01.12.09.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 09:44:05 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: Felix Lechner , 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. Date: Sun, 12 Jan 2025 17:43:59 +0000 Message-ID: <87sepogc68.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Guix, I'd just like to apologise for CC'ing Guix-Devel at this point; this patch isn't nearly critical enough to warrant the noise after two weeks' wait - which, as Felix points out, really isn't that long in the grand scheme of things. I got impatient; I'm sorry. I'll try to remember to remove Guix-Devel from further replies to this Debbug. (...but it is a good patch i promise, pls do review it so it doesnt feel sad and neglected =F0=9F=A5=B9) Felix Lechner writes: > If you require that change personally, as I suspect you do, my > recommendation would be to clone the Guix repo and pull your 'guix' > executable from your custom branch. For example, I have in my > channels.scm a branch that I rebase periodically. [2] I guess it's time for me to bite the bullet and finally do this, then :| I had hoped to avoid the annoyance, but maybe it was inevitable. And you're right - I do need this change personally. I'm working on this. For anyone here who's interested, I'm currently trying to figure out a way to have an authenticated local fork. The current design of `guix git authenticate` prevents merging upstream into such a fork, so this is a bit of a challenge. I've outlined an idea in the threads linked below, which will require modifying the authorization invariant a bit; I'll probably share the full proposal to Devel once I have a working patch: https://lists.gnu.org/archive/html/help-guix/2023-09/msg00010.html https://lists.gnu.org/archive/html/help-guix/2025-01/msg00093.html > Pings are generally frowned upon, but I also just did it yesterday. [1] > Pings are usually not worth it anywhere, not just in GNU Guix. Pings > are likely to be ineffective in hastening the acceptance of your patch > but will almost certainly affect your social relationships negatively. Thanks, good to know. Will try to keep that in mind. I do wish there was something I could do to get things moving faster, but I guess this is a limitation of projects that run on (primarily) unpaid volunteer work :/ From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 13 08:47:58 2025 Received: (at 75145) by debbugs.gnu.org; 13 Jan 2025 13:47:58 +0000 Received: from localhost ([127.0.0.1]:50719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXKnO-0004bS-2V for submit@debbugs.gnu.org; Mon, 13 Jan 2025 08:47:58 -0500 Received: from mail-10626.protonmail.ch ([79.135.106.26]:47819) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXKnJ-0004aw-9t for 75145@debbugs.gnu.org; Mon, 13 Jan 2025 08:47:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1736776065; x=1737035265; bh=YTyIWJSPujIObZCKIfFoc4IYVC3/KS5QbMGdeZ1m5gg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=Ld3IpMNbT5XgLuGrZ0MLs2q9/17/s98fny4OiQuBckvwCy8Hgg9sEN2P821d9shjI kMcU6yV+wct5Vb7leC7q+nW4FTCAIEfborUfxua4RNN/xRom5Eczko4UmioFggH2gF AQC/8goviVttGdnoZJcbpg4Y8jFjoeumfWjvQ2FGXR+ICcxLDQfaGJC2pglMSNsDig ir8gTtDjVCm6mOBalmcxNpZXRnquv1tQYEAotM1/ezPBHlFd84OMVMvbLbRjU85pFD lu7+JyXgWbK/Kem4FuZc10hemVrAZ12BJzpnjFuuL4Ob29hKEQ/zXfHmOqiryfmcMU YnRTDeOKbBETA== Date: Mon, 13 Jan 2025 13:47:40 +0000 To: Felix Lechner From: Attila Lendvai Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. Message-ID: In-Reply-To: <87seprdbnv.fsf@lease-up.com> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87seprdbnv.fsf@lease-up.com> Feedback-ID: 28384833:user:proton X-Pm-Message-ID: 2d662b1d78ca7a695de7bb0aefa661f15dde4dcd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > > this patch failed to get any attention in two weeks > > > Two weeks isn't a long time in free software projects. A more common > time frame would be between one year and eighteen months. ...and with such a delay most patches bitrot beyond recognition, then after= one too many burdensome rebase the contributor gives up, and then the whol= e thing gets forgotten. or an alternative reading of this is that this process selects for contribu= tors who are willful enough about that specific patch to push it through th= e finish line of such a marathon. in my opensource experience 1+ year is nowhere near the average, especially= not for patches with a localized effect. unfortunately, i only have a vague/vapourware proposal to resolve this, whi= ch is to develop better support for channels, and then allow a thousand flo= wers to bloom (i.e. allow/facilitate the division of labor). it's not neces= sarily a safe/simple/straightforward path forward, but it would solve the b= ottleneck of the central control. but either way, i wanted to speak up against normalizing 1+ years of delays= . -- =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CAction has meaning only in relationship; without understanding rel= ationship, action on any level will only breed conflict. The understanding = of relationship is infinitely more important than the search for any plan o= f action.=E2=80=9D =09=E2=80=94 Jiddu Krishnamurti (1895=E2=80=931986), 'Relationship', Colomb= o Ceylon 2nd radio talk (1950) From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 13 10:48:09 2025 Received: (at 75145) by debbugs.gnu.org; 13 Jan 2025 15:48:09 +0000 Received: from localhost ([127.0.0.1]:52539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXMfh-00025c-D4 for submit@debbugs.gnu.org; Mon, 13 Jan 2025 10:48:09 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21180) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXMfe-00025P-Dr for 75145@debbugs.gnu.org; Mon, 13 Jan 2025 10:48:07 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1736783274; cv=none; d=zohomail.com; s=zohoarc; b=OgtQmkcaU6A+Z4Jv9OGsndDyvM28Sv/PmtoG6w15HOAsFZQDk883+6vpKI6PbSMZs6hErwLDXYdijAJc3mjz3qcd06R+Go1A5JMHXOkXiS57tQ9qzawtoBO4bGpB1zjZSJ/HYpv7SHqC4olQTIZMdRUYiHcywMD0kNUXcLlQFQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736783274; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=fUorfeCAMGjXljp9GtkBoHWQR6mDXa4WUCYQlobZIuQ=; b=A9nfxj7uFU75J2dVS9FjVBLY1TqUDps+JhTpDDUU0gAfgA182J3lYQWmzhjiusovxdbExmlSCHQIzLcQKAeLGMQvqkWk014QdVUyyr4TpnuTvbh//wYxCS3K7hI/W3tgV3EbNowl01mGEyIgppYdQAMgC5yFRM0Wc9sX3cWt+MI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1736783274; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:In-Reply-To:References:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To; bh=fUorfeCAMGjXljp9GtkBoHWQR6mDXa4WUCYQlobZIuQ=; b=cLAXL66gOmd0Yd09aaSB1sU8AFlAZreZSRwme5egiBYWRYHrMKvxuyyF3OtortbD UsFk/6X44DrNZYEAZ7POfRQqWgvP0SgaNZExAAgP05JBSi+rwVJ+21RpQr7as5nQj2a HoLHdwA0yDFNhOlxZ8SkX3HHiKEvQcjs/fyR4Spc= Received: by mx.zohomail.com with SMTPS id 1736783272814362.2777159150146; Mon, 13 Jan 2025 07:47:52 -0800 (PST) From: Ricardo Wurmus To: Attila Lendvai Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: (Attila Lendvai's message of "Mon, 13 Jan 2025 13:47:40 +0000") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87seprdbnv.fsf@lease-up.com> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Mon, 13 Jan 2025 16:47:49 +0100 Message-ID: <87jzayk95m.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, 45mg <45mg.writes@gmail.com>, Felix Lechner , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Attila Lendvai writes: >> > this patch failed to get any attention in two weeks >> >> >> Two weeks isn't a long time in free software projects. A more common >> time frame would be between one year and eighteen months. > > > ...and with such a delay most patches bitrot beyond recognition, then > after one too many burdensome rebase the contributor gives up, and > then the whole thing gets forgotten. I agree. Let's not normalize long delays. Pinging is, in fact, encouraged. We're still in the slow process of forming self-organized teams that cover a manageable amount of packages/files and have enough dedicated committers to review patches. This works fine for some of our sub-communities, but for others it still doesn't. Once the community grew beyond a size where I recognized each and every contributers the problems of structurelessness have become painfully obvious. It is not something we want people to get used to, but it's also not something a handful of people can fix by decree. Speaking for myself: I burned out a few years ago and haven't recovered even a fraction of my capacity today. This is something we really want to avoid, and ideally people would self-organize around committers they know, who can champion their contributions --- instead of calling for the proliferation of private channels, a different kind of unmanageable structurelessness. -- Ricardo From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 08:43:56 2025 Received: (at 75145) by debbugs.gnu.org; 17 Jan 2025 13:43:56 +0000 Received: from localhost ([127.0.0.1]:36421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYmdg-0005fF-67 for submit@debbugs.gnu.org; Fri, 17 Jan 2025 08:43:56 -0500 Received: from mail-10625.protonmail.ch ([79.135.106.25]:52203) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYmda-0005ev-Mh for 75145@debbugs.gnu.org; Fri, 17 Jan 2025 08:43:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1737121423; x=1737380623; bh=1OMl/kYjIZZZOocKT9QT4WuAm9i/0DeZ9mA1/XKcMqU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=HLu6stqWXbLc25qgebXZs3qSL99irva9C4jt2VEBPNvVK6onZ8WXDw9HT1IeMnuCP jc97spPSdWwg7MNwWzvRtyoDq5/Vx272d0B9ia4rTdfiGkASOFxfjsnvsgNF9gIvMK lbX1vRI0skFAFCpirq3ss2fe48aIpya5quPZAdrHh9uvkxvFJyd0lT/hwgnQyY4BLI krIlKrW2yGGg7ieFw0AcT+J3Y655kwLn+YiJFsioKSiIR3ukfQ/21zDgahJeC3JRw1 EFk55ehjuHOsPJyYccHXDjKs1mfB2+sxsqAoyjluaATx8UZwvgCCU1kzbYR+v3qZAJ 78boBxIYQBPyg== Date: Fri, 17 Jan 2025 13:43:36 +0000 To: Ricardo Wurmus From: Attila Lendvai Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. Message-ID: In-Reply-To: <87jzayk95m.fsf@elephly.net> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87seprdbnv.fsf@lease-up.com> <87jzayk95m.fsf@elephly.net> Feedback-ID: 28384833:user:proton X-Pm-Message-ID: 4d06d27d3d7489f9250fb075ddf2b09798c9eb1c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel , 45mg <45mg.writes@gmail.com>, Felix Lechner , "75145@debbugs.gnu.org" <75145@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > instead of calling for > the proliferation of private channels, a different kind of unmanageable > structurelessness. not private channels, simply channels that are not owned/controlled by the = exact same set of committers as guix proper, and not demanding the exact sa= me requirements from their contributors. this may seem like nitpicking, but i think it's an important detail in this= context. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 15:25:34 2025 Received: (at 75145) by debbugs.gnu.org; 17 Jan 2025 20:25:34 +0000 Received: from localhost ([127.0.0.1]:38937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYsuM-000599-1H for submit@debbugs.gnu.org; Fri, 17 Jan 2025 15:25:34 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21190) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYsuG-00058m-1t for 75145@debbugs.gnu.org; Fri, 17 Jan 2025 15:25:31 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1737145517; cv=none; d=zohomail.com; s=zohoarc; b=bM+2CV61iNsLdcvCcPsFQh81+R2PvDCW1AHW7ftfR74qVd1ETa4Ee8iqsQrOqhRKe0fqTeQ8q9pjOJ5gflahZTQyVxyWoW3bLgi7fUtx8fRz86gYQ4TneAf/vCpsnQovVw5wAEbwK+d9JGin4VRdK0oZPT4UKAklBdbYJzfi0LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737145517; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=vSe2ulkfsnZ3Pgdxj4jH+RCl/fjitNYa1L+9Ik82r7Y=; b=jx5QTC7Q+mqYXr3TvbsKvA0nU/Ly66v3Sgbh3zudbutAnSGHJzG/d6fNxLxCf50Bvx8+4eymHFQtqBNKjEkSSqY9vMJc9pmsQsrGYtOnQ/umGIFHxXIZMSW0owXSAkX8NuhHAMnvDFQIwaUHKm5CdfhQK4x+siVlOFOohqawARE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1737145517; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:In-Reply-To:References:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To; bh=vSe2ulkfsnZ3Pgdxj4jH+RCl/fjitNYa1L+9Ik82r7Y=; b=RzAtYRiHa4NytK1RJvgVahL6fAS+oLsbMdD2KFUxW9FfHhxvI7mq1b0xkpjfJ6lB BIRXUwHjjeuDF9m8leUU4dxUk5HkiE+sGigYWgmOu9ldkW+cb1fiuQ+sWIzGCR5NdQv z6oJmQkncaM6NzF9B+7mUCelUMPlNuFtZzy7/e+8= Received: by mx.zohomail.com with SMTPS id 1737145515277125.96998083337314; Fri, 17 Jan 2025 12:25:15 -0800 (PST) From: Ricardo Wurmus To: Attila Lendvai Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: (Attila Lendvai's message of "Fri, 17 Jan 2025 13:43:36 +0000") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87seprdbnv.fsf@lease-up.com> <87jzayk95m.fsf@elephly.net> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Fri, 17 Jan 2025 21:25:11 +0100 Message-ID: <87ldv9fas8.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel , 45mg <45mg.writes@gmail.com>, Felix Lechner , "75145@debbugs.gnu.org" <75145@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Attila Lendvai writes: >> instead of calling for >> the proliferation of private channels, a different kind of unmanageable >> structurelessness. > > not private channels, simply channels that are not owned/controlled by > the exact same set of committers as guix proper, and not demanding the > exact same requirements from their contributors. > > this may seem like nitpicking, but i think it's an important detail in this context. Thanks for the correction. I did mean personal channels, i.e. operated (or abandoned) by a single person. The guix-science collective demonstrates an alternative model, where people of similar interest band together to provide a channel (or set of channels) that is governed by different rules than Guix itself. This started out as a set of independently run channels (guix-bimsb, guix-bimsb-nonfree, guix-science, guix-science-nonfree, guix-hpc, etc) and is now a much more streamlined and cohesive shared effort. I would advise against running a multitude of personal channels in favor of collaborating with others on a much smaller number of channels -- and ideally as a team in Guix itself. -- Ricardo From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 18 16:19:24 2025 Received: (at 75145) by debbugs.gnu.org; 18 Jan 2025 21:19:24 +0000 Received: from localhost ([127.0.0.1]:43957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZGE0-00052Z-02 for submit@debbugs.gnu.org; Sat, 18 Jan 2025 16:19:24 -0500 Received: from nanein.fr ([185.230.78.41]:53518) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tZGDx-00052I-Jp for 75145@debbugs.gnu.org; Sat, 18 Jan 2025 16:19:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1737234854; bh=A96Q8AnyA2j4C0gCaagQIlaDlsZ8D72nTUZ1NyFvzgE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Om4Sbxae/kDnIvhebje+TcCLS/nQ9S3kjqRFhx1yysENP/vPFLGRFUyO2A0gov4pj WRpQ5zCU+Pz8R+UDySw2N/b4oN4+OqGce/1TX8Gyy+l6Z1ik/vZE6g5LSvreqL/xom ZDkhB6LwioDaoaM4pm2xqqVffsL/Lw/mJGwdgEz13KuBnxY5RAibGQv0IoQa4ueZq5 gxA4fYBIOzVYDcAzHhleEXChfIYiHFfYUcPuFTLbEgqN9io/jw250ja7TTQTjMUEV1 4Egt8srzwS3pNwE2EfJKObOUQJ1YUTEiFip+rD2FSV/k6qUYd+1au1UY+uJ7rj7+yT Jsxufqx0e9Ta4p6f6sAwPJjir7Lv2/NJTMdRAioG0MmosetN8PJOCktz9OqZRu42bE AhRqfhHFJPeCZmvShIwRplgOVk+Zgm/oeLi2F8zcXmDQ/ugJIu64jCqOzY1a447fmI k77rGJ6lRtuWdCG5z/LThwl/6je6ex0VWjr2eI005yzA1U3/1mkisXQX5lPgyKxpFp 6WTehO7MajU5tCKCU/w7Z5ZeJuO8D+VWUlpal5YMDxcvC9MoaSheuIxETjW5XOCASe ipJgysBtxzEQ2etrTwBbRiTberkInD+1ZXMbwkiEPolyj3N8mXphggad1HUZp9JFTT 2uptoRtO6x3JgfO655O6zM24= Received: from cochea (wg.nanein.fr [IPv6:2a0c:700:12:50:1::109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 056E01401ED; Sat, 18 Jan 2025 22:14:13 +0100 (CET) From: Arnaud Daby-Seesaram To: 45mg <45mg.writes@gmail.com> Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <87jzb3zzqm.fsf@gmail.com> (45mg.writes@gmail.com's message of "Thu, 09 Jan 2025 12:03:13 -0500") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <875xmo11ys.fsf@nanein.fr> <87jzb3zzqm.fsf@gmail.com> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Sat, 18 Jan 2025 22:13:58 +0100 Message-ID: <87o703hlk9.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, I apologise for the late answer. 45mg <45mg.writes@gmail.com> writes: > Arnaud Daby-Seesaram writes: >> As you said, you are doing something similar to `etc-service-type'. Is >> there a reason not to extend [2] it directly (e.g.=C2=A0like >> `greetd-service-type' does in `(gnu services base)')? >> >> You could, for example, prepend "NetworkManager/conf.d/" to file names >> and pass the value to `etc-service-type'. WDYT? > > [...] > > When we use `etc-service-type`, "/etc/NetworkManager" becomes a symlink > to "/etc/static/NetworkManager"; and "/etc/static" is a symlink to the > result of building the derivation returned by `etc-entry` (see (gnu > services)). And derivations are in the store, which is read-only. So we > can't create "/etc/NetworkManager/system-connections/". And this won't > do, since NetworkManager itself needs to be able to write to that > directory to manage saved connections. > > So it looks like that won't work. That is unfortunate; thank you for trying it out! Re-reading your patch and the implementation of `etc-service-type', maybe `network-manager-configuration-directory' could be replaced by `file-union' defined in `(guix gexp)', WDYT? Otherwise, your patch seems good to me=C2=A0:). I will let others comment and give their opinion. Best regards, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmeMGZYQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDJHiEACWAZNT3iF5k9gjoKHyj1oVUr37PEC5Z14I vYClwcxY7ILkOquepMyUlbcQ8sH2GbwlN87C1xicmhIiQ7IXNp40F5ilHbXoPruD YLsOpsnD25GCXz7IusLPk4NQVjOBn05DmuG+3sNoapxwaZ00mG3ut8gYde1iHqoK g7vuWhiJozzQ/OKIuxu5SodwiPQ9Ocqrkozt+ERItQIAcM2IYv347vR/i/1P+nFV 3EusquR7LiF9/e5fYORmZLWJ7SqzieDCd3YSlLEMJrQx4/GmxKJIZF6V+jDu1kaR +KWXXkVHnUDa7Lqn11AEpP/5q9lGzOqS2UjJ5w6aaS7CMuaSq83ssTrDuNKKqoSf xEc/6aFxs/Hg3ABwLaCeRALrezdrJnDAa7EZ1VhoFkaTa4WNOXEJ/UCW09ECpAc2 61smQ/kHb+gB6q/ZSXFq1/iJxRVkbQfBaOsqMHfG2Ijqikq+xM/v7t+JwZFrrA35 RQAOhMOnfZox3dn+MtAngVHIk6ossFK5wSpB10NZHYAHJxGWnoAx9t6KASFsnPOn oGnrICtEn956H5kR+uAG8rKLggrTvb2ioGgbbQ5SPwAdsz3g1mJU/0lI1wPfMfOc RgARoLZx8JeaFAwWertam+3fn2+JvrXgL+rfo6oTfSTpB6YQe3WkxXWwYLwy1fIy AIfsrnPlHg== =6XrX -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 20 23:44:12 2025 Received: (at 75145) by debbugs.gnu.org; 21 Jan 2025 04:44:12 +0000 Received: from localhost ([127.0.0.1]:52902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta67X-0000az-T0 for submit@debbugs.gnu.org; Mon, 20 Jan 2025 23:44:12 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:51651) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta67V-0000ah-Al for 75145@debbugs.gnu.org; Mon, 20 Jan 2025 23:44:10 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-216401de828so86680195ad.3 for <75145@debbugs.gnu.org>; Mon, 20 Jan 2025 20:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737434643; x=1738039443; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7domqmYDrkM4hYZ7KVG34bcmb+BKPIgKWmsGVhqp90=; b=hi29EK0PZ4StHFvDu9xEYExcAfJbm9SVAPigHuJetWSh7olEtu+U9Jbnyp8+flEvcn 3u31RVWOHMSTHdQ0ias1kauXpUFt6zPWb+h6qqeqCgqWnGAIqMxQqFTGTZ3fk1wuDh4r e8pPsJzeXig9xuUJ2N83HGbpCC6O7iFq5bLqLi90Dq73mn7g5Apreh8lYAhvbcagQPPQ C8hR59yXyb4V22mvP8Pn/AEncuu9UcD0YV1G5r/RmYRYkl5P5ed8uYO1qbRTZIZFMOSt YrTgEWM6lORfWYiHUWt2ElMzNx53PORFqr4LZ3xVLBWYVQRcuVCjyNK1cmYmsr6sN3zR 4hNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737434643; x=1738039443; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=f7domqmYDrkM4hYZ7KVG34bcmb+BKPIgKWmsGVhqp90=; b=BWeKVnKApCdZegAkWZKbsDHaHaXFzcVYti3bp9OVqh7cG6G9TO5Nsyp/tCzOT39oRe P3slI/HpGgFg7ACW+TonMNnGD7IVVpvL8ShRfDciOyDmnh5HRSG3pma3/vYFZZTGjbTf Jp0A7eSV8aiw5mqLGH5+ty+YoI1bl9t7nHiJCSqnIpecxPZD4XcX3CfZs5ZqELgSmFGe CL/nh5CutlBTEigD19svBGP2cYuKp5b1bISQiZZwRVTSn2hSwx5L8Tg6uzIajav5zsBy ErnziWHMsVLOJDvP/WgaiMw6QLku/nqq3VYS7Y0xnV1RNZOEn9/IOgKx4/hQ4DNaL532 M0Ww== X-Forwarded-Encrypted: i=1; AJvYcCWiZ4p4OTgHIkNdEoCsx4WJSnkPmAtnRknn+h0J96UOMVmize6Nta2QlbvwR90y8e7wKTC5DQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yw8Jw504pz+zA0yLsR8CWavOMeEc6+kwJhUluJMh8CMptfvMFlP bNrDkTuxPUuHWX8gGbRFjCzFQl476s7lVk7ecjSfuvXKwswP4N3i X-Gm-Gg: ASbGncvjjUQBODe971BR5/qS/qwJemvgO8QxumvWWJk04FEeL9KXYIijrNRb63BAw0g 0XvqWuUb8bjTSZS2xowSQ6Dl8MRuLR5D0WZ+EK0S+iHqcSNfW2ZpB/I+D8kC0ekSYiH1L0cJV3p GSphzMWxsl2Yky2tFaSycXPt9gjamjIu76P4EJKAvNIzzQRX1R2v09RHRESFlasW3sF1M4Y46nT IgxFl79QjkokL/kYvqnGBHi68YoOj9acD8LxD6O2k0KuxW6SC3cXa7x53EBpXv8f4s= X-Google-Smtp-Source: AGHT+IFRTmIYQ08e5O5gkoOywQPbKFguPx3Pne5BplJ2ufASIxuj3gcMv4fm9VPTrnOd1qZhX4g5AA== X-Received: by 2002:a05:6a20:729e:b0:1e1:cd09:e08d with SMTP id adf61e73a8af0-1eb21485321mr23312049637.11.1737434643182; Mon, 20 Jan 2025 20:44:03 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72dab7f06b8sm8158677b3a.16.2025.01.20.20.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 20:44:02 -0800 (PST) From: Maxim Cournoyer To: Arnaud Daby-Seesaram Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <87o703hlk9.fsf@nanein.fr> (Arnaud Daby-Seesaram's message of "Sat, 18 Jan 2025 22:13:58 +0100") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <875xmo11ys.fsf@nanein.fr> <87jzb3zzqm.fsf@gmail.com> <87o703hlk9.fsf@nanein.fr> Date: Tue, 21 Jan 2025 13:43:51 +0900 Message-ID: <87jzaoai9k.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Arnaud Daby-Seesaram writes: [...] >> When we use `etc-service-type`, "/etc/NetworkManager" becomes a symlink >> to "/etc/static/NetworkManager"; and "/etc/static" is a symlink to the >> result of building the derivation returned by `etc-entry` (see (gnu >> services)). And derivations are in the store, which is read-only. So we >> can't create "/etc/NetworkManager/system-connections/". And this won't >> do, since NetworkManager itself needs to be able to write to that >> directory to manage saved connections. >> >> So it looks like that won't work. > > That is unfortunate; thank you for trying it out! > > Re-reading your patch and the implementation of `etc-service-type', > maybe `network-manager-configuration-directory' could be replaced by > `file-union' defined in `(guix gexp)', WDYT? > > Otherwise, your patch seems good to me=C2=A0:). I will let others comment > and give their opinion. A file-union also result in a read-only directory in the store, so if NetworkManager needs write access to that location, that also wouldn't work. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 20 23:52:32 2025 Received: (at 75145) by debbugs.gnu.org; 21 Jan 2025 04:52:32 +0000 Received: from localhost ([127.0.0.1]:52919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta6Fc-00012P-7y for submit@debbugs.gnu.org; Mon, 20 Jan 2025 23:52:32 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43283) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta6FZ-00012A-OC for 75145@debbugs.gnu.org; Mon, 20 Jan 2025 23:52:30 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-21631789fcdso74670095ad.1 for <75145@debbugs.gnu.org>; Mon, 20 Jan 2025 20:52:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737435143; x=1738039943; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y6HNOygB/cTuCtToxkmOecPTT3CVjrmkzIl4cXpjRng=; b=Dx0iDlX9/RnlQpLThysqRCsJBdaKs8Ij7ZHq9gaduzkPK8TDVGf9vLRMx/iUiYyuuS lTHcAL/M7eX1+mig6/Z3yIWSQIYxkrHMAGSbrVxL/SlLlxUW6YYQ6Ao9Rm6Kzc0HBCGv opTKRdWFvkAVTjo5O1BHuXxffYQfQtCZCGAH2uyqf/ODYe5Us8vuN88NP82+g26cxzCj BbrNr2UpkOIZXEWSo3Qfko8XhePY82rmRoloBahC81xTnPNrhG7ubFM4KLrKhITszVZO u6a8sQ3w80Mqg6hIcFMtkpf3q3G2JGLipjsbRFpZ/TiLTNOsPOBidqdsIKyhLzy9HtTP qvgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737435143; x=1738039943; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Y6HNOygB/cTuCtToxkmOecPTT3CVjrmkzIl4cXpjRng=; b=RCZ9keGnirYVKsTMpAkMWUWWL/UhuW4rBFdaJg62FNDgd8QEakkVJKrRM8Saar6lw2 VI7mF6VD4AOF6OuV7jwOSdC32Vxzos7PNzHHHLiWjFhUGoVRsvxyRf92ElnD2xc9lRwT IdKYn7h9XrcfEglr56Yfq7/fEKP9UasCnErFlg8N8F3U9tr9FcJWDIeDZnBV5UV0ZfCe heSDeWsOwKlIf255ARFr56PuJ0T46BH1bG1q8irL0zZiEiPC1NwNVhj7SO125qs3g7Iu rUB6+dA4SPmQ/801SbTrmmXf1O2tYRpjemUEAKkIKdJZ1KEDkLo+7Yhue8vq5CLIbUio 9rVw== X-Forwarded-Encrypted: i=1; AJvYcCUQVfu4tZaY63x8qvWn9ma+bVXqJptdBUDG+fxOtFGBGpRfiy9U8C3kBJ3fzcz3PXjBWukeUg==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yzx5KZ1ULNmRW+m56hwkOShT24oTu2sp5Ab5Pa9VAAQ2jM22VAK 0aCziIVO8rnXWR7Qj/jzka0x34sMQ3feDM4sZnhlaQinPFUDiBQ4fGvuM8MS0wA= X-Gm-Gg: ASbGncs0XsWLMV7aJjgrN5/2eZNYbbwroVoaDk9uaEyOkjHncpg8i/WF0aqLvLPbt2T SG+IPojz9YSuJIGXYU1dZLtAAbj+ckXN4GrAVvIg8WJRv09B+F/WxzTf8rWGeIN7nuXa08L6dsf 8fYbtscvB0fNiKrDxSkZBX2t9epWtAHiFIDLQ5Sm/LHqmuz+Xv2UNy1uXFpQoPb8SsNQIDTQSnb G1+InD3bAN2laRnMMxgH2UEzl27Fw/z82irtpKqd6Ig+ntHmJWW19XSvFZDGNYLJDY= X-Google-Smtp-Source: AGHT+IFjn48KgPKcWxvCuWBreihGWBzop2vF2iZYrShW4Zak/eKHdnWuORY+qi+t1nwEkmSL2dA5JA== X-Received: by 2002:a17:903:120b:b0:215:758c:52ea with SMTP id d9443c01a7336-21c35c8ca8emr192063815ad.9.1737435143213; Mon, 20 Jan 2025 20:52:23 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3ac658sm67953575ad.127.2025.01.20.20.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 20:52:22 -0800 (PST) From: Maxim Cournoyer To: 45mg <45mg.writes@gmail.com> Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <87sepogc68.fsf@gmail.com> (45mg.writes@gmail.com's message of "Sun, 12 Jan 2025 17:43:59 +0000") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87sepogc68.fsf@gmail.com> Date: Tue, 21 Jan 2025 13:52:11 +0900 Message-ID: <87frlcahvo.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel@gnu.org, Felix Lechner , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi 45mg, 45mg <45mg.writes@gmail.com> writes: [...] > Thanks, good to know. Will try to keep that in mind. I do wish there was > something I could do to get things moving faster, but I guess this is a > limitation of projects that run on (primarily) unpaid volunteer work :/ As mentioned by Ricardo, a good way to try to tackle the load would be to get involved with a Guix team and conduct reviews. There's no need to be an expert; even just spotting typos and small details help. If you have time, applying it locally and giving it a try and sharing your experience is also very valuable. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 03:36:56 2025 Received: (at 75145) by debbugs.gnu.org; 21 Jan 2025 08:36:56 +0000 Received: from localhost ([127.0.0.1]:53174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta9kl-0004fl-Hu for submit@debbugs.gnu.org; Tue, 21 Jan 2025 03:36:55 -0500 Received: from nanein.fr ([185.230.78.41]:59752) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta9kj-0004fX-Cs for 75145@debbugs.gnu.org; Tue, 21 Jan 2025 03:36:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1737448606; bh=VKdOR5QfM6cAs/9wwtnWiC5tYhDzHE8/ZD97BhoZZNI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=hm2s5FD1lzWlbHPGNCgHlgilOLhFCoeKdmmGFhDcAL3eCBZ4X19RM0/90JXeQ4SAn BovfvorqXXQjpfAOH+C6/2q245rj/HKMOZw372amJxLmws7mgGjnrbrqO1KsudAMRU pA/h/YTyfomb4NjiihIdNjaN7Bg6c4cY/B2Cm2sEIDF09h7rNRFccU6MnH4ST2973w b3bDNtJkJCbJcvbPGIO9ViPTZCoKOPy7yJbnqNO1Cn30MUDYg7Se4HUC6WoNN3Up3X ERlmGYHWa9VANVfVqC9p0taijs2vEYaRdiNUCWxTm59VcbwEmWCk94cVDKxXdNz1ET mxc0HK7oqJc9dUknYt3pQ3j7h1ShrInjYhDRExa8iEmVdOu6Io3txZ2fm4ec5JKWyC VxclB3le+Wtftsed2El39qMU2N7LSG1FjdTJTGY6ICnO8iDCtCMtALEpkp3dDdGkbD v262gVEzl78/qznRbAncIbVyyK+5ncQfMQVkNwlH/D2xkhYESPLLn7WellDbbZZgQj B2unHwJGP9gyLkYzROStM5a3cISKqlJJ6qfa7jVidHwawr+EnD4cp3MzwQ+p8KNQYv a1CIcdWmeBLSOu2++ihsAh7Bl200/kTLgT9toh4cBq4hbX6kMi7Hm+q/pOjNYfWQH4 7Ba6iEuyMFiVrrTVGkkcQKJU= Received: from cochea (eduroam09.au.dk [185.45.22.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 2B9801401EC; Tue, 21 Jan 2025 09:36:46 +0100 (CET) From: Arnaud Daby-Seesaram To: Maxim Cournoyer Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <87jzaoai9k.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 21 Jan 2025 13:43:51 +0900") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <875xmo11ys.fsf@nanein.fr> <87jzb3zzqm.fsf@gmail.com> <87o703hlk9.fsf@nanein.fr> <87jzaoai9k.fsf@gmail.com> User-Agent: mu4e 1.12.7; emacs 29.4 Date: Tue, 21 Jan 2025 09:36:41 +0100 Message-ID: <87jzaoa7hi.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Maxim, Maxim Cournoyer writes: > Hi, > > Arnaud Daby-Seesaram writes: > > [...] > >>> When we use `etc-service-type`, "/etc/NetworkManager" becomes a symlink >>> to "/etc/static/NetworkManager"; and "/etc/static" is a symlink to the >>> result of building the derivation returned by `etc-entry` (see (gnu >>> services)). And derivations are in the store, which is read-only. So we >>> can't create "/etc/NetworkManager/system-connections/". And this won't >>> do, since NetworkManager itself needs to be able to write to that >>> directory to manage saved connections. >>> >>> So it looks like that won't work. >> >> That is unfortunate; thank you for trying it out! >> >> Re-reading your patch and the implementation of `etc-service-type', >> maybe `network-manager-configuration-directory' could be replaced by >> `file-union' defined in `(guix gexp)', WDYT? >> >> Otherwise, your patch seems good to me=C2=A0:). I will let others comme= nt >> and give their opinion. > > A file-union also result in a read-only directory in the store, so if > NetworkManager needs write access to that location, that also wouldn't > work. Sorry, I was imprecise. NetworkManager needs to write to /etc/NetworkManager/system-connections The issue with extending etc-service-type was that "/etc/NetworkManager" became a link to the store, and thus system-connections could no longer be created/written to. However, the configuration directory is /etc/NetworkManager/conf.d . What I was proposing was to use file-union to create the configuration directory (in the store) and symlink it to /etc/NetworkManager/conf.d . This is close to what the patch already does. I merely suggested to replace a homemade function by a function of (guix gexp): network-manager-configuration-directory and file-union do a similar job if I read them correctly. Best regards, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmePXJoQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDMD2D/wIlD9fbe+uZ52UGOGwAN07C/dT4FYcg8h5 gIdhOFPC5jltYZuv5uEeSD1oMQ/5WL11mWkXnr1+MOi+DZwrjpHuNSaGjEQ2lVx1 rrtdX6hrEQKiqpCUTXFDVIu/0418liN2PyYsghBTruXSRTP+nQIAMZ30hW8KBmUI KPc2N/hwAGvZxc91cLoUacHGrgbmauvPQoIMH4gl7VW8myajohUmQRlJyVYG/lP1 hoxHjsopvglmYGdb3K7BStqkdNL+lOMyMTJqrl9Vcz/nKQ0E+5cq5YV1Gfw5NawC x6LAt+lEFAPW4sunkl8SMChwgA1RVhs0gibHqjFD9/U9GIOUGjlMdhPywJrLcnkQ MoEQbIjYuU8YL7CqXc1taG4kyhnZvtgrgacLR4SvRzmoESjbYHUMGVAZNWEji8zx O2AAIaY9eo+j9lIHpIIfXPc03Y49NDPNTducAJSCPhPhc4XtAnsL65vglJPKJ1jT lDvAJjRI9t6F3mQJbt8aqZMFcB3UoAvpeE1bo2xgqQL/RqtCLSHeYer02+QdTxuy dpgQ5A1xjcaNDs6THUbmydzf6dEvN1LkXnMhGfb4/24LK67R7aGzcnzq//TJ/F9R 6cwjMJCj2s5Wney4861dGcKMtT9aXm/qutesLdi3PezBkgo+rHneJaN/OYSuLRO8 blOMh2yLFQ== =ItNN -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 08:02:24 2025 Received: (at 75145) by debbugs.gnu.org; 21 Jan 2025 13:02:24 +0000 Received: from localhost ([127.0.0.1]:53651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taDtf-0006DJ-Kh for submit@debbugs.gnu.org; Tue, 21 Jan 2025 08:02:23 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:61822) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taDtd-0006D0-4I for 75145@debbugs.gnu.org; Tue, 21 Jan 2025 08:02:22 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-21669fd5c7cso98077715ad.3 for <75145@debbugs.gnu.org>; Tue, 21 Jan 2025 05:02:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737464535; x=1738069335; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=2YcAHIUNl5mO1UajaseLknlVJt5gzH1ilHE/P/IVH54=; b=DSOiYX48+5Nb7jAAewn0vpBgWA78vO5F5urS7DBnjRE+/uLtgTCTMMKWoe5MLXnNnS O45UDXIzT8DGM6i0Wn4T+8mTL+TQYbFKuRQeZEj7754W0XErHPe9JZnk8n/NMPcBIalf 70v2XBOi7EZrtH4QBv+oxUyyxKDw2F3A7oovWlbKXmi0iCum4S1HIg4waVnnLWBvTUyY q0x+sllkA+y8qe5P16vhv1zAn4U9KFmrhnWYNaKBLbN8VZ8vR7AkL66PwCi9E8oGXQLP XP527L323WjnWGDMV4VCTGeNnvkdLGAWpphcteJQA2BkM4P17ZBZQPVqlSVI7raZ31wU qKnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737464535; x=1738069335; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2YcAHIUNl5mO1UajaseLknlVJt5gzH1ilHE/P/IVH54=; b=ef+1gR2bZMtDSm20/DO41A4e1kMHYgLpT3WFeYTbvpKMdhWamMCMILRKtShKe/id7C +GG1HqH8ZwG6j3rQwEdl9NZdoaN468SfmfwUOHWH+88np+wXCtVcKeZpL3QfEHHv4Vyy MykrZJidrcq8ifVZyOiya9fRSNNMCVI2FgulWZedKm17wvpSV7OlA5cnLNszpRZ0PgRA p0NorhPDnOqqNZKd6iDdxPEQjFWDJHOqgxPWpuTwIXRe9fvlt7+wBjYqanTTSQfc11Np ZR5jpMWfAIhHTaBb9GUNBKHUH/lLOxq09EWtbFIYsTWwuWAPAr4WZiTaQSEJZ3ZD6BuD Q4hQ== X-Forwarded-Encrypted: i=1; AJvYcCXKkKrzfO48FzdD/cnKbHFLqzrBHlnzYTtfReCoRNA7WNBXkdLAgtTO5x/Ofo8KyQS3wqGucg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzUrFw8hsgLNxnOX29NnTKbfpkpo4x9msc9TJthxMxzcRlys3jz +WGZuCXfuzZl7hYoFlfN1L2/kFb0dvMZ8mnsO1mGb2l6VzCA0X2HoLhjIY7qSPU= X-Gm-Gg: ASbGncvCdxoCbu4UPQUP5aEVPhDEPLKDgAFAd9S+JM9+D+UUSvMAeVw5EDsr6cVKgFn +VSOvRQ8iXtfK2bX1CkxLPCsXlhnwOL1uvHQ0VTokZ6Q+WlCmhyLA/fd9hN3dM3MX4a8fuGL8LL uK7eML10pWh95yq5GGcBVeeFJO5HK/jFjBdMnNRhTNBH+/Fxg5K9h6rm8KOQv0YQzfC/r+In8+q 3mACGLqgOMmT5tSQ1wV4Rv0nGN3yUON601N+lNfaPwLMWPPiBSB9kk+Fgy107lyORw= X-Google-Smtp-Source: AGHT+IHJaa80E/5ywu0j9w/Dsawlbaj+hrdQvBdvCdi7jBETshOtnyjtFQBxyDrSHb5k9d+LrAKGoQ== X-Received: by 2002:a17:902:d50c:b0:21a:8dec:e59f with SMTP id d9443c01a7336-21c355c28f0mr198949515ad.39.1737464534556; Tue, 21 Jan 2025 05:02:14 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3a8543sm76887185ad.124.2025.01.21.05.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 05:02:13 -0800 (PST) From: Maxim Cournoyer To: Arnaud Daby-Seesaram Subject: Re: [bug#75145] [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. In-Reply-To: <87jzaoa7hi.fsf@nanein.fr> (Arnaud Daby-Seesaram's message of "Tue, 21 Jan 2025 09:36:41 +0100") References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <875xmo11ys.fsf@nanein.fr> <87jzb3zzqm.fsf@gmail.com> <87o703hlk9.fsf@nanein.fr> <87jzaoai9k.fsf@gmail.com> <87jzaoa7hi.fsf@nanein.fr> Date: Tue, 21 Jan 2025 22:02:03 +0900 Message-ID: <87wmeos4l0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Arnaud, Arnaud Daby-Seesaram writes: [...] > Sorry, I was imprecise. > > NetworkManager needs to write to /etc/NetworkManager/system-connections > The issue with extending etc-service-type was that "/etc/NetworkManager" > became a link to the store, and thus system-connections could no longer > be created/written to. > > However, the configuration directory is /etc/NetworkManager/conf.d . > > What I was proposing was to use file-union to create the configuration > directory (in the store) and symlink it to /etc/NetworkManager/conf.d . > > This is close to what the patch already does. I merely suggested to > replace a homemade function by a function of (guix gexp): > network-manager-configuration-directory and file-union do a similar job > if I read them correctly. Oh, I understand now, thank you for explaining. It seems to make sense to reuse file-union then. 45mg, do you also agree it makes sense? If so, could you rework your change to use it and send a v3? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 21 19:17:15 2025 Received: (at 75145) by debbugs.gnu.org; 22 Jan 2025 00:17:15 +0000 Received: from localhost ([127.0.0.1]:58229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taOQk-0000VI-I3 for submit@debbugs.gnu.org; Tue, 21 Jan 2025 19:17:15 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:27777) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taOQa-0000Ts-PI for 75145@debbugs.gnu.org; Tue, 21 Jan 2025 19:17:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1737505017; x=1737764217; bh=33Tg6DRa5cyYRtPhNHicW3us9gN0ylefEfUDT49Yrmg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=bFeDTEIJir9tru0ZuI1tXC7r3+jJEwMc8flSnRRxMbcaNjQi4kzoJzYstVqiFy6+z KdKOAIGOoURLV0iTH/mdY75pN8cyUVJlgnYLFp5rHmLOSjc2hQNlgW0lnq58Mdhj6Y Vhp1N3KTa7WkMPDRbHxAK6PVYefUANl7DlQBjCnETn8AcOekAisS1S3hM7N99cWXSW uXq/Fk4yAa/XtBDv1eyjV9vPRA+ToRK6+iAVPf4jQAXuH77b0YRgjAbxEtlsHeUvsH Zbjhpyzn4ML0bLyL71UrB53cH2YFi2nQwdmo98xpKapcnPKnPBMp7GP3t2g9Scv9HS kmggtDEndVnBA== Date: Wed, 22 Jan 2025 00:16:50 +0000 To: Ricardo Wurmus From: Attila Lendvai Subject: Re: [PATCH v2 0/1] services: network-manager: Add extra-configuration-files field. Message-ID: <-h5Hwm4p6WeQ3B3qCJhnwYCYoEaXv4VWcwJqKPg9nRslB2HPIsFsdXDJrssm_2_xkycfn8YTsVvyn3jnpb02m8gdSv-LnbDqu7A62WMbXho=@lendvai.name> In-Reply-To: <87ldv9fas8.fsf@elephly.net> References: <7743f403ebf1693fc386a397e9aed1975b43f900.1735323486.git.45mg.writes@gmail.com> <87seprdbnv.fsf@lease-up.com> <87jzayk95m.fsf@elephly.net> <87ldv9fas8.fsf@elephly.net> Feedback-ID: 28384833:user:proton X-Pm-Message-ID: 46702346d530f3fdc9603f4ca9eb93040e59b647 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: guix-devel , 45mg <45mg.writes@gmail.com>, Felix Lechner , "75145@debbugs.gnu.org" <75145@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > I would advise against running a multitude of personal channels in favor > of collaborating with others on a much smaller number of channels -- and i agree. i meant to use the expression 'let a thousand flowers bloom' to be= more about freedom and (friendly) competition, not the actual number. > ideally as a team in Guix itself. i don't think that will ever be satisfying because it's not facilitating th= e division of labor, which requires delegating responsibility (aka freedom)= , which in turn requires isolated parts of the system with isolated consequ= ences. there's no reason that the same set of people, or the same level of "securi= ty clearance" should be needed for the core guix tools, and e.g. updating t= he packages of the python ecosystem, or updating gnome. i'm not saying it's easy to draw such demarcation lines. what i'm trying to= say here is that i don't see any discussion or at least some wishful think= ing that it could/should be like that. and meanwhile there's a clear bottleneck at the center, no matter how much = we talk about consensus and equality... at the end of the day a commit bit = is a commit bit (which is ok, because it couldn't work any other way). -- =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CSince olden times conscience has been understood by many people le= ss as a psychic function than as a divine intervention; indeed, its dictate= s were regarded as [=E2=80=A6] the voice of God. This view shows what value= and significance were, and still are, attached to the phenomenon of consci= ence [=E2=80=A6] Conscience [=E2=80=A6] commands the individual to obey his= inner voice even at the risk of going astray.=E2=80=9D =09=E2=80=94 Carl Jung (1875=E2=80=931961), 'Civilization in Transition' From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 14:51:45 2025 Received: (at 75145) by debbugs.gnu.org; 1 Feb 2025 19:51:45 +0000 Received: from localhost ([127.0.0.1]:60076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teJWr-0003gu-Ae for submit@debbugs.gnu.org; Sat, 01 Feb 2025 14:51:45 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:61792) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1teJWl-0003gc-QT for 75145@debbugs.gnu.org; Sat, 01 Feb 2025 14:51:43 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-21669fd5c7cso53725125ad.3 for <75145@debbugs.gnu.org>; Sat, 01 Feb 2025 11:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738439493; x=1739044293; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JRJSkwr1N2/DEjqSkjEQlvi+8vAwTv0rlVVKqTI9XIw=; b=GS8gvko9cqGuRHXFGsovPnQcaAcnFWLAEl58Xw/Pcp9y1B+O9Khk3p3fF3LHJsyZi2 4tQPZCMOtTs5E1/hHZ94TFgNk0PrlsiIXNwvj7ej+lYZZMvO92dpPPSaX6lbAu4FI9qd otWrM2fKSWQopjOyMUotj9MKNyk69qWHh4srjNlhjf+t7Qx0kIvGIy8UqA2Jfp9klq5X ghLBgL0+DuCCpcFLxss0OCNfcUoUJTTaHBQeQKxIA5+XfR9EmQrEQHNjcFMRE18hWgDM owc0MECxYCpzystbI3sN/TdqjUT6DdGzpDvK+wy8V+N3AvKMSomQQJBRkO+Wfsdfky+T OwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738439493; x=1739044293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JRJSkwr1N2/DEjqSkjEQlvi+8vAwTv0rlVVKqTI9XIw=; b=rtZDJiav1MnRhWAZEWHnOn34GcRFACFtDdBhv+wr+diVVDl5bvHNRHNkO1KlVqUKSN SySdn81fvpHLhxNg6TxHiiwE/NXZ0nZ/6nwmFg+vCVl/iWhLEacx6poSxdfJoUF4GmD5 aZd46Dw6ukXaT76CVaEUx/OqSDE9mOZ7mHAYZal8AKCnVJeKndrLGMMKA7j7e5PrhzKe /IvZw+U2fVPAq8nqOUwN/LmX4gvi2dx6ISqJc+gYfKcRRWeJPoVo+96wSYtPOjaEcN23 PnKzW55O9XNQ4NV/fc13Ucc9iZLUZSbeM8QT1VooNvcTDqmEoZC0NTv+zqvlRJ46UEW8 8cNg== X-Gm-Message-State: AOJu0YzCYldIojwmSTRYmCibiHa/DXXlJ+Oww3RHaas6VtF/moK2Wjk0 PvHMVvFRwUcvyhHeN0ZdCLqQb+YOpZuIqrJSbn3E8AWL8mpdzsbygDvrdqfs X-Gm-Gg: ASbGncsF/5OGBjrCOO1fEPMHAE22KIj4A6WPSo+V2o3qqONHzH9RiDi0HG9HyKxkDN/ vV/oQePMPWOjBALSKZ3xMatqO+FAgC7UiOgiOAd8FuSfaBRzaSkWc3iNGfTk0QfKh02CQ7DRE8E lGFj57MqpTakyN8H4BhEieB69L2ESrXSbVa6vbEQP7YH0QcaABGMwZmPCRTztVtQqNXfJhYieSz snvJ9TeKS2nfc4YP6yPXMus151Uh45uok4B9fwkqYEog0elRzym1Qhq0HEiJHGIwR7vnOcJcX7m VawmQ5ymFdPS0Sq6J/BvQvX6yNP8loB1Z/9axA== X-Google-Smtp-Source: AGHT+IFbT+rXtk2fyAREZLOp2F3EUUcexEmW51jyJM7zkQIRx6ZSeQNjU/C8fpS653c3jWgxSeLotA== X-Received: by 2002:a05:6a00:1396:b0:725:db34:6a7d with SMTP id d2e1a72fcca58-72fd0c7c6c5mr23351201b3a.23.1738439493128; Sat, 01 Feb 2025 11:51:33 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cebbcsm5482856b3a.130.2025.02.01.11.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 11:51:32 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 75145@debbugs.gnu.org Subject: [PATCH v3] services: network-manager: Add extra-configuration-files field. Date: Sun, 2 Feb 2025 01:19:26 +0530 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <87wmeos4l0.fsf@gmail.com> References: <87wmeos4l0.fsf@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Arnaud Daby-Seesaram , 45mg <45mg.writes@gmail.com>, =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Allow users to specify additional configuration files for NetworkManager. These files will be added to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [extra-configuration-files]: New field. (network-manager-activation): Honor the new field. * doc/guix.texi (Networking Setup): Document the new field. Change-Id: I07479958e4d0aa318328c666a9630b779230b300 --- doc/guix.texi | 21 +++++++++++++++++++++ gnu/services/networking.scm | 13 +++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b1b6d98e74..58ce4663c3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21541,6 +21541,27 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{extra-configuration-files} (default: @code{'()}) +An alist of file names to file-like objects, representing configuration +files which will be added to @file{/etc/NetworkManager/conf.d}. +NetworkManager will read additional configuration from this directory. +For details on configuration file precedence and the configuration file +format, see the @command{NetworkManager.conf(5)} man page. + +For example, to add two files @file{001-basic.conf} and +@file{002-unmanaged.conf}: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (extra-configuration-files + `(("existing-file" ,(local-file "001-basic.conf")) + ("constructed-file" ,(plain-file "002-unmanaged.conf" + "[keyfile] +unmanaged-devices=interface-name:wlo1_ap +")))))) +@end lisp + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index af28bd0626..4e455cc114 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 muradm ;;; Copyright © 2024 Nigko Yerden +;;; Copyright © 2025 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1253,18 +1254,26 @@ (define-record-type* (default '())) (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) - (sanitize warn-iwd?-field-deprecation))) + (sanitize warn-iwd?-field-deprecation)) + (extra-configuration-files network-manager-configuration-extra-configuration-files + (default '()))) ;alist of file names to file-like objects (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config - (network-manager dns vpn-plugins) + (network-manager dns vpn-plugins extra-configuration-files) #~(begin (use-modules (guix build utils)) (mkdir-p "/etc/NetworkManager/system-connections") #$@(if (equal? dns "dnsmasq") ;; create directory to store dnsmasq lease file '((mkdir-p "/var/lib/misc")) + '()) + #$@(if extra-configuration-files + `((symlink + ,(file-union "network-manager-configuration-directory" + extra-configuration-files) + "/etc/NetworkManager/conf.d")) '())))) (define (vpn-plugin-directory plugins) base-commit: b85d20e853192a92093cd8d6a5756ec80e94c658 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 18:36:33 2025 Received: (at 75145) by debbugs.gnu.org; 1 Feb 2025 23:36:34 +0000 Received: from localhost ([127.0.0.1]:60431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teN2P-0000Ig-HT for submit@debbugs.gnu.org; Sat, 01 Feb 2025 18:36:33 -0500 Received: from nanein.fr ([185.230.78.41]:56212) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teN2N-0000IM-CT for 75145@debbugs.gnu.org; Sat, 01 Feb 2025 18:36:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1738452684; bh=as/UVt+O7+8fFYdn1hk81fvI8d0uTlNusKH89+KGLJs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=J47b8nQ8P0POqk0eMKYvZ2Pfq9YA0tvQ3UlbaefWXoY1adPbou0u5xi/oiJtwydsa H2ADba9ITrwMS1j2EXiQemed0cIE5bp3FLaYsYgUif1N5eXqq/QDPn4RSFrqlz7xce 3g8Z662VvacNQCH5tjaYHNX7fz/5ZcvTYLjwLY7rAUa8u4Ej+lOufsR5UUKipeBMkK UUq8h9yDXwITFOzr1OWBdeDuG9t/77AF/FUX22K7lE8nJV9in42qMg/33FDPsuZZhp sfT2MvAO7zLT2Fe4vuguRw/mriVRtA7Sa7KJDBy46TxBrKED44NTiKA0X6Eti+frnU Ev3ihy7PWf8DYcEnOaWy2hGX4pm/5xZ1BdW+0dJgpuYqe4NF0lEFfRPiluzRF+VBKD uAbHQanePOUkAclI+WPnAbYTYmHNbyr9G7b+mYYI7M2K2Ks+p0l09fEZWeEtiI0zFL EbSCk1XrdVh8EJmWyLe8H1HAolD+aFYIgKGrgwwRZHj/13CbeEKM8IgQpu6jRMQNJx /qpyc+tYKvrH8tZNN4tjvN5kWBCqiTqmxj/3RUdOISz7tbEay2ddCT/Vcq4YAkAeJK GEbbJCSukuzM3wFFk2fSeCmr3df49++P8s8wSJbUw5IQBYXO4ZN/RQF/oNiXgf2i4b PDTysdm7l0a/FJoRAvFZmkOY= Received: from cochea (wg.nanein.fr [IPv6:2a0c:700:12:50:1::109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 192CF1401EC; Sun, 2 Feb 2025 00:31:24 +0100 (CET) From: Arnaud Daby-Seesaram To: 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v3] services: network-manager: Add extra-configuration-files field. In-Reply-To: (45mg.writes@gmail.com's message of "Sun, 2 Feb 2025 01:19:26 +0530") References: <87wmeos4l0.fsf@gmail.com> User-Agent: mu4e 1.12.8; emacs 29.4 Date: Sun, 02 Feb 2025 00:31:16 +0100 Message-ID: <871pwhs0mz.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Thank you for the v3. I just have two minor comments. 45mg <45mg.writes@gmail.com> writes: > @@ -1253,18 +1254,26 @@ (define-record-type* > (default '())) > (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, re= move. > (default #f) > - (sanitize warn-iwd?-field-deprecation))) > + (sanitize warn-iwd?-field-deprecation)) > + (extra-configuration-files network-manager-configuration-extra-configu= ration-files > + (default '()))) ;alist of file names to fi= le-like objects >=20=20 > (define (network-manager-activation config) > ;; Activation gexp for NetworkManager > (match-record config > - (network-manager dns vpn-plugins) > + (network-manager dns vpn-plugins extra-configuration-fil= es) > #~(begin > (use-modules (guix build utils)) > (mkdir-p "/etc/NetworkManager/system-connections") > #$@(if (equal? dns "dnsmasq") > ;; create directory to store dnsmasq lease file > '((mkdir-p "/var/lib/misc")) > + '()) > + #$@(if extra-configuration-files > + `((symlink > + ,(file-union "network-manager-configuration-directory" > + extra-configuration-files) > + "/etc/NetworkManager/conf.d")) > '())))) If I understand, the `if' is here to avoid creating a symbolic link to an empty directory: if no extra configuration files are provided, do not symlink. However, in Guile, it seems that (if '() 'yes 'no) evaluates to 'yes. Therefore, the symlink is always created. A solution is to use `pair?': =2D-8<---------------cut here---------------start------------->8--- #$@(if (pair? extra-configuration-files) `((symlink ,(file-union "network-manager-configuration-directory" extra-configuration-files) "/etc/NetworkManager/conf.d")) '())))) =2D-8<---------------cut here---------------end--------------->8--- Apologies, I should have realised that before my first review. > +@item @code{extra-configuration-files} (default: @code{'()}) > +An alist of file names to file-like objects, representing configuration > +files which will be added to @file{/etc/NetworkManager/conf.d}. > +NetworkManager will read additional configuration from this directory. > +For details on configuration file precedence and the configuration file > +format, see the @command{NetworkManager.conf(5)} man page. I am not sure that "alist" is the correct term. When I hear alist, I think of something of the form ((key-1 . val-1) ... (key-n . val-n)) The documentation of `file-union' uses the term "two-element list" for its argument. Maybe it would be more precise to do the same (I am not very opinionated on this). Best regards, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmeersUQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDO5CD/429bWN+kZ+PH1j4QUapjHeiyCczN+yjlh6 JnqPqBMI43zaBgXZYSAjfmQKaeMHZWz1VLO+iab1OMLs9e4vcuoHLPrlIT0CjGAd UIqWRwAda1OIDbP2qBGUFh749X+x/CWtpCBPZna4CIWFLtGpr3OnKoTiPObgKbuv fEMmCtkvBqbllVjhIw8uCDIy6RjwZ+n5u+E8aAWGRuP3WcF8k5fuKl6Gu5mDXZwo cguXLUFETbePf+vST0nNzg12svz4Sld17OlSfFpmc253GIFAsysWgTgwxZFWDfQM fWKW+2esHUL1AfiXUSZ0mtKnIhBFLGyF3xZxg1Fpt89HZNBfigOacfy2+OCZORCN 9e/U9Dh+yCCwNdxHVEwCcm1CMgAyCwIvVVP0VgpFN6DqoVwisMF1uKU6GslQm27e mWvcTl+4+1MRtLn3MFP52l8rG6Gur6R4nDeF0tAW2xurR6Whl8dj0cIrUh/h/oL5 jrb6CFbIzWyBaq4Y1w3uDnH7AMt8foOpBbCmX5OZWy4QERoxbs28c+ha6/jaUE3t wfFzl1lmPtwlfqsJpWfhzJyIqWGzYv2Vz5Ch9TEhDBBp31m7qnhcJf0dOIV78aeE fHiWH/4Pwu3Q8ESkJytarGvjJvOD2dIL91xSjf4l5kaUrfRz2I+0dkBZr5OOnXRs KgYrewIgIw== =osrN -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 02 01:47:19 2025 Received: (at 75145) by debbugs.gnu.org; 2 Feb 2025 06:47:19 +0000 Received: from localhost ([127.0.0.1]:32792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teTlH-0006Yl-41 for submit@debbugs.gnu.org; Sun, 02 Feb 2025 01:47:19 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:50188) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teTlF-0006YO-8P for 75145@debbugs.gnu.org; Sun, 02 Feb 2025 01:47:17 -0500 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2f42992f608so4483832a91.0 for <75145@debbugs.gnu.org>; Sat, 01 Feb 2025 22:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738478831; x=1739083631; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=wITz1IRpN4DYjj9qV/X4iwCq7iWVWo9gKmFFNV4arSQ=; b=gneesfTFHHrYKZnFs8iWpJ0dzpauEIemEMlQNmJd+SQGCAqb/tFl3ee36bgJiBkUMU lrtKF/+fChGAsTFrkLlFT8uyrpGvIxfJp05JNAuXJqUtAE08YuF44rlK7xPof7HeSgpU 9l70TddXmuScd025ngvfOho+od0ryrQ814InLWiezGrh/15MXNWIC0H1ZMmrerCKYnPS kyYwr16eUGsWK3sVCCuMSKfgW3wWITXPGgTa3Tqdzjw0csbVfFn3SZdKtqCzOLUURs0a Lx2LnII3f2PLSmnHOhLeC7nHtDkqrpY4VX0pg8qP+YB5D3eLwh9zcj0Ieg4MyOjeF3Le UDtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738478831; x=1739083631; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wITz1IRpN4DYjj9qV/X4iwCq7iWVWo9gKmFFNV4arSQ=; b=bRAchf2kKRNS+64Ssqg6DYTH3D4HHpRxkvbkd8cHA3We/1C3tHJPZt49KwJaiDVzTr K1QTTcEAMhFqY/aGamqcVkTf/EDV3b11TZG8uMMS7RKtVeSMN07qoZ6Iyd084E+ZAg1L Ll4rzk6clfP8MXgMKztajws2PzsZ6PzKUE0T5UcASFXarCNlJzidni0J8yml7kpqFmWD TwRzwv7t7gs8gCmWISObRPC1/hapVLxbAWV8MkaAKPpZYsH+OGDGrkJ2DbqCse/x9bhm uG6dVfY2pta3vOY1N5HoZ4QT8ujIgfAaEg5ULbbpnnXIVwEytqChMPktQnA2JqVwiiIx A4xg== X-Forwarded-Encrypted: i=1; AJvYcCX+3q2zCeRBlkn/ynPjaSEMr59wxpHyUf8z9l+9PRgsQ6GKw1e7M1bjeID8ujMBNmTVVNCQow==@debbugs.gnu.org X-Gm-Message-State: AOJu0YyiZ/5Cw1H+vEtXMHdPmEB7g8ysUDJtaV2DuLfXen1dTOX58zTH wcvdrQn0/BcKxOE88xXw6vI5ykXFDYugKi/tl+T6id0MNjSAYnaT X-Gm-Gg: ASbGncvlxWWES+dvOd2NsVWzgYcvgMtSnq81pzqroxLi3RYQisGTYAsX0AsT32Li+Wp JVerxUwLutynCn7VtI5iXlQlzCRP4qAckOkacR5qmmWAiTsfw8syjwS+D9hEnh0bOEssawDLgig QlL2OhyIJJ96NBc0jf4P/IucWwk5j+BHkR+TfnUMiKiGqvgs8ecjWigtVEGc8FfphnwoupX9rXy E/sJTf/1ePTOIkzIOy7e1Rf32ltlNFCTJl7MdBwGTgwFeddvStPpBKqyODtXKhvSJpEkYq1Kwuy tSeE0gdW71OY X-Google-Smtp-Source: AGHT+IGuH/AMOqpOxneDiG89o1LspsqHrKtgaKa+O7EwhDGfA9zFjm42XdS1Z/DEz7oVFIr6P0Fh4A== X-Received: by 2002:a17:90b:2583:b0:2ee:a04b:92d3 with SMTP id 98e67ed59e1d1-2f83ac8c4b9mr21797114a91.34.1738478830958; Sat, 01 Feb 2025 22:47:10 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f8489d65a2sm7220842a91.29.2025.02.01.22.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 22:47:10 -0800 (PST) From: Maxim Cournoyer To: Arnaud Daby-Seesaram Subject: Re: [PATCH v3] services: network-manager: Add extra-configuration-files field. In-Reply-To: <871pwhs0mz.fsf@nanein.fr> (Arnaud Daby-Seesaram's message of "Sun, 02 Feb 2025 00:31:16 +0100") References: <87wmeos4l0.fsf@gmail.com> <871pwhs0mz.fsf@nanein.fr> Date: Sun, 02 Feb 2025 15:46:57 +0900 Message-ID: <87bjvkkfmm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Arnaud, Arnaud Daby-Seesaram writes: > Hi, > > Thank you for the v3. I just have two minor comments. > > > 45mg <45mg.writes@gmail.com> writes: > >> @@ -1253,18 +1254,26 @@ (define-record-type* >> (default '())) >> (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. >> (default #f) >> - (sanitize warn-iwd?-field-deprecation))) >> + (sanitize warn-iwd?-field-deprecation)) >> + (extra-configuration-files network-manager-configuration-extra-configuration-files >> + (default '()))) ;alist of file names to file-like objects >> >> (define (network-manager-activation config) >> ;; Activation gexp for NetworkManager >> (match-record config >> - (network-manager dns vpn-plugins) >> + (network-manager dns vpn-plugins extra-configuration-files) >> #~(begin >> (use-modules (guix build utils)) >> (mkdir-p "/etc/NetworkManager/system-connections") >> #$@(if (equal? dns "dnsmasq") >> ;; create directory to store dnsmasq lease file >> '((mkdir-p "/var/lib/misc")) >> + '()) >> + #$@(if extra-configuration-files >> + `((symlink >> + ,(file-union "network-manager-configuration-directory" >> + extra-configuration-files) >> + "/etc/NetworkManager/conf.d")) >> '())))) > > If I understand, the `if' is here to avoid creating a symbolic link to > an empty directory: if no extra configuration files are provided, do not > symlink. However, in Guile, it seems that (if '() 'yes 'no) evaluates > to 'yes. Therefore, the symlink is always created. A solution is to > use `pair?': > > #$@(if (pair? extra-configuration-files) > `((symlink > ,(file-union "network-manager-configuration-directory" > extra-configuration-files) > "/etc/NetworkManager/conf.d")) > '())))) > > Apologies, I should have realised that before my first review. That's fine, and good catch! >> +@item @code{extra-configuration-files} (default: @code{'()}) >> +An alist of file names to file-like objects, representing configuration >> +files which will be added to @file{/etc/NetworkManager/conf.d}. >> +NetworkManager will read additional configuration from this directory. >> +For details on configuration file precedence and the configuration file >> +format, see the @command{NetworkManager.conf(5)} man page. > > I am not sure that "alist" is the correct term. When I hear alist, I > think of something of the form > ((key-1 . val-1) > ... > (key-n . val-n)) > > The documentation of `file-union' uses the term "two-element list" for > its argument. Maybe it would be more precise to do the same (I am not > very opinionated on this). Indeed, I think a list of pure lists (rather than pair) cannot be called an association list (alist), as that shoud be made up of pairs (using cons or the dot notation). See info '(guile) Association Lists'. Thank you for the review! 45mg, would you mind sending a v4? -- Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 04:57:59 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 09:57:59 +0000 Received: from localhost ([127.0.0.1]:32768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ti9VH-0003nG-6w for submit@debbugs.gnu.org; Wed, 12 Feb 2025 04:57:59 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:44475) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1ti9VC-0003mu-Om for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 04:57:56 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-21f5268cf50so73085855ad.1 for <75145@debbugs.gnu.org>; Wed, 12 Feb 2025 01:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739354268; x=1739959068; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uqYGo+XH4pkSidEvoL1fTi7/+d+Q3BkzVDLcG/RsWnM=; b=ILjZkVDP/0305dcvZ4BzZ5dLTUgv3CIycsj6CTzq6ubA/Hc3kgHEs3gBPoYpyG0ZCs sUH5SAl8uKcMappyw13NdEKksUdtUVf87lyVPjaYDVn9H7YVszxVWXMkV4IeXr6+lJUd hlpN2GrLoF1Y0YJ9s+SPrkxwwqKfOe4PxElSdex5kO7EFtWdic5OLY1kTDzLcXoFSqeS /bj7IHpNc4Ncw0FqLfGbZNVKdro01zRN/abSy9MDQB1dZ3r7Ctq2evSLxlT9Pa1wBWDr W5ZqicO6uMOHmkT/iFknrK0pJVyfRdP489NrAKmIhOGa3grLtBmleKiDR2+6cpinL7c7 eTbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739354268; x=1739959068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uqYGo+XH4pkSidEvoL1fTi7/+d+Q3BkzVDLcG/RsWnM=; b=Ik4TdBROT3CRZRv1NNtmhLXfveU2/tOtfVu+M8cRZhvN4k8aDLFhk12VPiaU7FW08z +nmPMwWEoGit0ztqj6k2d7bJYnosNoadVoHIZAsI9w511Gbqcidj86duT9DNUXA7yC4V hcslCaY0WdPikbpu1J2r65/IHZnxnYTloJOSHRjb+FDf2HhgyUJF9kV559vIkw9FrCvn lQxUduIQEfSaLmiIR8buA3qQad/pEcH7wIn/xNvcn2SQRXlAClcbMsdQr++xf9BYyA24 iz4OhqQ10wlJiv6EzbmsgcAapFSJqgzkn1tXbxs2MDTg5QZLTGIEjt7KxN7ob6Uq+/xC s5LA== X-Gm-Message-State: AOJu0YxyhRbtvTgUWQpcPT8rWtsAnTVYeNFYymC7Regu/4ezS8T7CwP/ w7iFoTxLQ+tY3+SLg5CciqFlDKgAOBhU5JMcTmJOqC3KpMRQaIE8pCmhRN56 X-Gm-Gg: ASbGnctiK1z9YVLSNAv/hxdkFP+HM4MmzMqYuIdouA3WHPIj/cNP1Cbox9Zw5OnE35M KEzBqAApdW8UwgfgxbBTtEHn5nDEtwtPD0yQxH6q0Pn/TfLQpGT+Q436F73X0FlexLvpkPHYHcW t43go5uf2NtlotFBEnyhwDxfR5tbXjG/nEDA9hqhahz47ZCNHvoKNE0IZmpQ6E1cwCnE9lTCnAz d/L6LZEQT1PpYgyZMlcZPESajZczxX5b+WuwcMZrFaaaRE4mlM7dGhfhX/S06cXDfrCE/jWPj2m G5WvxZiNTKf4FwaLaFlfQWpuN8FxlQ3hN8wE4w== X-Google-Smtp-Source: AGHT+IGGEJuJE7QLd5Y/c6JXDy7f5ezIefe971qXGpBCyqOt/igo7pLlUzf2X8dr4+IeP/PlR69sdw== X-Received: by 2002:a05:6a21:6f07:b0:1ee:3116:1b66 with SMTP id adf61e73a8af0-1ee5e6667bamr4940771637.34.1739354268310; Wed, 12 Feb 2025 01:57:48 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-730884f5711sm5648332b3a.9.2025.02.12.01.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 01:57:48 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 75145@debbugs.gnu.org, Maxim Cournoyer , Arnaud Daby-Seesaram Subject: [PATCH v4] services: network-manager: Add extra-configuration-files field. Date: Wed, 12 Feb 2025 09:56:42 +0000 Message-ID: <3a2eb3562a02010cbd1bf319561c6d3b22d4ff2a.1739354202.git.45mg.writes@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <87bjvkkfmm.fsf@gmail.com> References: <87bjvkkfmm.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Allow users to specify additional configuration files for NetworkManager. These files will be added to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [extra-configuration-files]: New field. (network-manager-activation): Honor the new field. * doc/guix.texi (Networking Setup): Document the new field. Change-Id: I07479958e4d0aa318328c666a9630b779230b300 --- gnu/services/networking.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index a5aa86fd43..c93ed58cf5 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 muradm ;;; Copyright © 2024 Nigko Yerden +;;; Copyright © 2025 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1257,21 +1258,6 @@ (define-record-type* (extra-configuration-files network-manager-configuration-extra-configuration-files (default '()))) ;'((file-name-string file-like-object) ...) -(define (network-manager-configuration-directory extra-configuration-files) - "Return a directory containing EXTRA-CONFIGURATION-FILES." - (with-imported-modules (source-module-closure '((guix build utils))) - (computed-file - "network-manager-configuration-directory" - #~(begin - (use-modules (guix build utils)) - (mkdir-p #$output) - (for-each (lambda (pair) - (let* ((filename (list-ref pair 0)) - (file (list-ref pair 1)) - (dest (string-append #$output "/" filename))) - (copy-file file dest))) - '#$extra-configuration-files))))) - (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config @@ -1285,7 +1271,8 @@ (define (network-manager-activation config) '()) #$@(if (pair? extra-configuration-files) ;if non-empty `((symlink - ,(network-manager-configuration-directory extra-configuration-files) + ,(file-union "network-manager-configuration-directory" + extra-configuration-files) "/etc/NetworkManager/conf.d")) '())))) base-commit: d59a13b6401e7494d8d5c9c9f66df3318451be79 prerequisite-patch-id: 8f30976d00586f571762f6333bf29dd355a64dbb -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 05:00:07 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 10:00:08 +0000 Received: from localhost ([127.0.0.1]:32781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ti9XL-00044t-CP for submit@debbugs.gnu.org; Wed, 12 Feb 2025 05:00:07 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:47300) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1ti9XJ-0003rI-8j for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 05:00:06 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-21f48ebaadfso111868095ad.2 for <75145@debbugs.gnu.org>; Wed, 12 Feb 2025 02:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739354399; x=1739959199; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Kgy0M7YoxIpI9IarE34Av7POnpd9yr3Hl+eQ8E5ZQ1I=; b=Vr6CdMYtGfNRxmWaq94oCTBVwbseOwLkTwDCpg+p0w6q1qndzWt+LRaSNRjCCZXFll dApv1NWEl+gGtdlo1ygObDoUs8r5/1f1E+mW88h2vvnXo4Z+0Wj2v5IEJXiGDMKHMc+J 890P9Nzj4ZiF+KyOuJALFJNB6AX92FEHmVkKWbxH8McPtQZpPHl9mgPrQT8EYHsNs0dk +V3z6IVQ/y/aWH7klTw490w6I9kg8YnGUMbofeL8Zp94oQKx2eT4/pECrAAEJJhMsmaw L4dVLFXCO/6gsrl1ifY8Xcn7vot/M4gXK/4eu8rQMPbPmB74BX4t3DGm7kzAqpFmS9U0 NXUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739354399; x=1739959199; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kgy0M7YoxIpI9IarE34Av7POnpd9yr3Hl+eQ8E5ZQ1I=; b=FVO3vYt4EqdayG3gwSpWHrEJJ0p+Y7luhoL8Bn2yhC7YxL+PFI1q7yv/VZZuOUp6RS +21Oq1aKJY6hRjQwld96uHp1Eap/T8DhjNEobN0mTJ5RAVZK/rxdiZOOCXJyQHyikzE8 MlvS7FGGokGb1CWtYFdXw5QYVUgPuf8EC6Dk2MQ14OIh8XhhzSjBe7luS8ZucbIteXQV /WMgRHC8VPWZjItHnj72mptiLX4wllovlYAs+6j8+WTxdsxDw+wOoXybm85HyOBDD7M3 i3TF54a2/+CeNBtXL8kYB8PVIzWZCD9hGg674YTr+J3gj1k0cPxtES0oqkGeJgrX3pa5 5JDg== X-Forwarded-Encrypted: i=1; AJvYcCXkUoF92VWaW5YX4ynCgyqx3Cct70pCuD+tjOJhyG2STqwiVBDNW+h9EXz5x56IiQYHICmirQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwM44ijJL7/cXto9Y8Bd2c64l0DytqV6AVDuVJVsZMlBpyfUvbO DE66MQl80Ea1izzQ8P8jkfnlsoRaqE9P8DWWfs76tHIaelepFmnt X-Gm-Gg: ASbGncsDwOjK2zebt2tPJkwNuUCaKfS33dgRlmpikyqliuDMFiILKlxZ5HjFMUr5JVW O+UegNrT8JLn50yVvAVVvU82JK8EcRHGvZlqvSGnLKRPBjOjDgBk8g4LWvxf7J9k/WUeWQZYzL4 dVThn+6sMgczmVyzbVto37Q7nV1vgk3rAALS6KMrtu053OC7jtrxs2Xa3OYHUn1GPdHO7UYMGMh VlM3GGomG3Q/RYqNztt/+VCmr/2lOFQ06hBCagvgvK5X+BeR1xDr7RXkInQgJAXtggEml+vpXJF BGqLG9b74qgeUcS4 X-Google-Smtp-Source: AGHT+IF25vfhkOi+LZQbrUz+Y+0WH4/HDCUXZ/ZQouEm0zRkyUVmUq1PGy2hp18yYHckixQ/z5720w== X-Received: by 2002:a05:6a00:23d1:b0:730:99cb:7c32 with SMTP id d2e1a72fcca58-7322c380acbmr3461673b3a.7.1739354399165; Wed, 12 Feb 2025 01:59:59 -0800 (PST) Received: from guix1 (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73219ea34acsm2955034b3a.62.2025.02.12.01.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 01:59:58 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 45mg <45mg.writes@gmail.com>, 75145@debbugs.gnu.org, Maxim Cournoyer , Arnaud Daby-Seesaram Subject: Re: [PATCH v4] services: network-manager: Add extra-configuration-files field. In-Reply-To: <3a2eb3562a02010cbd1bf319561c6d3b22d4ff2a.1739354202.git.45mg.writes@gmail.com> References: <87bjvkkfmm.fsf@gmail.com> <3a2eb3562a02010cbd1bf319561c6d3b22d4ff2a.1739354202.git.45mg.writes@gmail.com> Date: Wed, 12 Feb 2025 10:00:03 +0000 Message-ID: <87h64zh49o.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Wait - I sent the wrong commit here. Please ignore this; I'll send a v5. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 05:10:48 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 10:10:48 +0000 Received: from localhost ([127.0.0.1]:32811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ti9hg-0007VB-4S for submit@debbugs.gnu.org; Wed, 12 Feb 2025 05:10:48 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:53676) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1ti9ha-0007Us-MH for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 05:10:45 -0500 Received: by mail-pj1-x1044.google.com with SMTP id 98e67ed59e1d1-2fa488351ffso6164223a91.3 for <75145@debbugs.gnu.org>; Wed, 12 Feb 2025 02:10:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739355036; x=1739959836; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IXttwUS6HB+lnrq1XobO0tKyPPRiaHGuhcQB+iGjHIo=; b=Ra8dR8u/gHF8Dr/69HATdqsrrVqeGQPm1dU/iVs/dlbcd9MBazy/wfrlqkBW65QsnZ /4mYwYlXIn+8NNsvE+lT5yR3XJyMai7vIze7xtBUk3SVvcsMTxjEvyhWToclNSExlKBZ 95OGVVIpUrRwr83Tby+LQiK1Pa25IYzVdBcVmtXLQqSvz/FezPghyu7+RKcjC+2hGm/+ DPO+JqiNCpXdinx4LQZS1b5EQ5au6t+eOnBLwNwSlfiXvjjE2l+8wvlOH40sL1IbltWW 6D3c8FkdsqlwOF6LjpfUNGROBGM3G+U89bn/p86BfnJ70ZDoJm5fgf8tBfs88CHnRLEW nzqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739355036; x=1739959836; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IXttwUS6HB+lnrq1XobO0tKyPPRiaHGuhcQB+iGjHIo=; b=BVCsXYr3T6YWIkTu33vW3pHiODZnIkvaTgGGuJ7XGZTBlRS7iisVRSclnIdQ1r3bki YrvxbspECNSZ6KM00GH4UvrdIlZU3jVfpzVJq0xMiRJIrLLkr2EOyw0M3uyry8j1Ro/Q Dygq0UbFjxmEgTH+sD/RD3GJDKj2axwjTKct5HDbBktU+uu4agEM5kYqbHLlE3u0ypnS qUCDN61ARuwp7MHm71j5/3YP9HIwxQjpYyd1AfjDqdBk/XCiaxpnSQan3kKD6WtDtVhP 5ALWGSLI1ZcxDvRos/pkn9PP384p4dUuxfbjoZEz8C0bjfN1h/42mXZrbFyeUbWwXtiq 7sHQ== X-Gm-Message-State: AOJu0YxOG1aHR/MNABqaEa4DekDLUdrO96KfiKfcbTjAVfkmxVmUdL3S fCBdAUx3VPBLXLGeutlW9+hcn9LMyIfgzqy23ic5VLAxL/pMh3bzvuJFRThC X-Gm-Gg: ASbGncsQB+GSQXWNIkGcllsP25A6Tyo0ldlGcjocawP12mM47H+eVJ1X5jwV3vU7gGy MghMjTWLXksnQ9oI0GbS9+BSGyn+bxZKtoOjRVcZet2MWAMUCtiXTfHayvF5AEMO9sjaejhWdu7 sZaeVsWDIEpriIiWlspC2a7/J7kXkP3eX0niVbSbp6xYMOHLBzcCEmVBTIqNbN7ht4Ou9bnY/7N OZVQUJJASI8mImvmOG4+kerWXgzuvaHYvPMXelmwDIfNHx3L+RZyPs7UCotmej9sI5F2bkZDPuo 62Vh3j+9ulZQ/JuR2EXTW6zVwTXRI/dI5cV+YQ== X-Google-Smtp-Source: AGHT+IHrGX7anO5JlnI9o7wP6wOLedhJlSk9jIkEq0cdBwa3tgX6uXw0iEtxcvOOAoyq5vnItgmwAw== X-Received: by 2002:a17:90b:524b:b0:2ee:a76a:830 with SMTP id 98e67ed59e1d1-2fbf5c58382mr4230446a91.24.1739355036165; Wed, 12 Feb 2025 02:10:36 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f368cf8acsm109916505ad.248.2025.02.12.02.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 02:10:35 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: 75145@debbugs.gnu.org, Maxim Cournoyer , Arnaud Daby-Seesaram Subject: [PATCH v5] services: network-manager: Add extra-configuration-files field. Date: Wed, 12 Feb 2025 15:39:22 +0530 Message-ID: <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <87bjvkkfmm.fsf@gmail.com> References: <87bjvkkfmm.fsf@gmail.com> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Allow users to specify additional configuration files for NetworkManager. These files will be added to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [extra-configuration-files]: New field. (network-manager-activation): Honor the new field. * doc/guix.texi (Networking Setup): Document the new field. Change-Id: I07479958e4d0aa318328c666a9630b779230b300 --- doc/guix.texi | 23 +++++++++++++++++++++++ gnu/services/networking.scm | 13 +++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ce780682ed..648398ed63 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21635,6 +21635,29 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{extra-configuration-files} (default: @code{'()}) +A list of two-element lists; the first element of each list is a file +name (as a string), and the second is a file-like object. Used to +specify configuration files which will be added to +@file{/etc/NetworkManager/conf.d}. NetworkManager will read additional +configuration from this directory. For details on configuration file +precedence and the configuration file format, see the +@command{NetworkManager.conf(5)} man page. + +For example, to add two files @file{001-basic.conf} and +@file{002-unmanaged.conf}: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (extra-configuration-files + `(("existing-file" ,(local-file "001-basic.conf")) + ("constructed-file" ,(plain-file "002-unmanaged.conf" + "[keyfile] +unmanaged-devices=interface-name:wlo1_ap +")))))) +@end lisp + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index af28bd0626..c93ed58cf5 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 muradm ;;; Copyright © 2024 Nigko Yerden +;;; Copyright © 2025 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1253,18 +1254,26 @@ (define-record-type* (default '())) (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) - (sanitize warn-iwd?-field-deprecation))) + (sanitize warn-iwd?-field-deprecation)) + (extra-configuration-files network-manager-configuration-extra-configuration-files + (default '()))) ;'((file-name-string file-like-object) ...) (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config - (network-manager dns vpn-plugins) + (network-manager dns vpn-plugins extra-configuration-files) #~(begin (use-modules (guix build utils)) (mkdir-p "/etc/NetworkManager/system-connections") #$@(if (equal? dns "dnsmasq") ;; create directory to store dnsmasq lease file '((mkdir-p "/var/lib/misc")) + '()) + #$@(if (pair? extra-configuration-files) ;if non-empty + `((symlink + ,(file-union "network-manager-configuration-directory" + extra-configuration-files) + "/etc/NetworkManager/conf.d")) '())))) (define (vpn-plugin-directory plugins) base-commit: d59a13b6401e7494d8d5c9c9f66df3318451be79 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 09:40:21 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 14:40:21 +0000 Received: from localhost ([127.0.0.1]:33530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiDuW-0004pM-M1 for submit@debbugs.gnu.org; Wed, 12 Feb 2025 09:40:21 -0500 Received: from nanein.fr ([185.230.78.41]:50586) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tiDuT-0004jg-P7 for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 09:40:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1739371211; bh=UEgMS88C45B5cSJ4Of5NLOnkvuDbZeNCwllBLwJridw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=RV5IxTee3w3PUgNfdH4BthwSpLW8Manwbx+v6ese1LYGt5SblLAFC/My9pGijNns6 PRiZybDKj99tNeZDLzkMCryBssylZ2e0df8XXi1arrOFkMcB5vrCYY5993MElZFO1D jMF6NXDkN0KMbwA9GowjnvHAXrfxyWuSaznNdMOFYkOMG4s8L4evXIDZwu/Ihjw/pu yqLkmKuMi0MnDVkeWiHA/xj9gSM11eeyusYCjtClma2rmu1jJUIRZMz9XbbL5Db4ZR CPS/yBVoXGlgoZXnZe5jNummB58LrdH+iPJwJiOdGvzrE+ZRtU+y/EDBuQUQzUy5Z+ dQ4z78cLlhqTeNDFkoswGIjjb8Ss2sQzNVZaRUexOy5BHaOuyX/gfvH1h6sRY8kn7f auoRYl6azaZ353YGiS7DnkP+uxJ2b7J/sObcGDzQJKJrWneUYNxdR23zMI4Er096Vo k3d/HmqHiK1inWkFVsChB27Wpx3bkqb7WQTaCSTDlFYd6l1AOXlR5mGFBQy2rUHjqS Bfj+B3yxiRfQDyn7EEPPCxsWm+txjZ1XGYWcfrZHYE/wUtlw02DztVcf2pBi+wF2UR SgO0u2jfxG/sVdWTIcBts8FkcBoynD8xHlEUhnD9YP53Oj3nCx22spiyasFiPeX132 RxdWk9cZJAIwG+aniW19SGlg= Received: from cochea (wg.nanein.fr [IPv6:2a0c:700:12:50:1::109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id E5DBA1401EC; Wed, 12 Feb 2025 15:40:10 +0100 (CET) From: Arnaud Daby-Seesaram To: 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v5] services: network-manager: Add extra-configuration-files field. In-Reply-To: <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> (45mg.writes@gmail.com's message of "Wed, 12 Feb 2025 15:39:22 +0530") References: <87bjvkkfmm.fsf@gmail.com> <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> User-Agent: mu4e 1.12.8; emacs 29.4 Date: Wed, 12 Feb 2025 15:39:59 +0100 Message-ID: <871pw3i5vk.fsf@nanein.fr> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Thank you for the v5. The patch applies cleanly on master, and works as expected. I have one remark left (it's the last one, I promise=C2=A0:/). 45mg <45mg.writes@gmail.com> writes: > * gnu/services/networking.scm () > [extra-configuration-files]: New field. > (network-manager-activation): Honor the new field. > * doc/guix.texi (Networking Setup): Document the new field. > > Change-Id: I07479958e4d0aa318328c666a9630b779230b300 > --- > doc/guix.texi | 23 +++++++++++++++++++++++ > gnu/services/networking.scm | 13 +++++++++++-- > 2 files changed, 34 insertions(+), 2 deletions(-) =2D the configuration snippet of the documentation indeed adds files with the right content and names in /etc/NetworkManager/conf.d, =2D the directory conf.d is no longer created when empty, =2D the man page mentioned in the documentation is correct, =2D last remark (non-blocking): =2D-8<---------------cut here---------------start------------->8--- (service network-manager-service-type (network-manager-configuration (extra-configuration-files `(("existing-file" ,(local-file "001-basic.conf")) ("constructed-file" ,(plain-file "002-unmanaged.conf" "[keyfile] unmanaged-devices=3Dinterface-name:wlo1_ap ")))))) =2D-8<---------------cut here---------------end--------------->8--- adds files named "existing-file" and "constructed-file". This is the expected behaviour (explained in the doc). However, the example is introduced by: =2D-8<---------------cut here---------------start------------->8--- For example, to add two files =E2=80=98001-basic.conf=E2=80=99 and =E2=80=98002-unmanaged.conf=E2=80=99: =2D-8<---------------cut here---------------end--------------->8--- This may seem counter-intuitive to some readers. Best regards, =2D-=20 Arnaud --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmesssAQHGRzLWFjQG5h bmVpbi5mcgAKCRCiMspegxOIDBjzD/41lWSORGFlk44czC0vp0ArK0m2tJpKyLZW +cpnOePpWx3o9TfuxZLrBl6OQ5jzsUI4koggyb4ht0kTbQv8ZySzTGZUSEWLurG1 r1i8yDZA/WotddlKhdPGC0I+IrQNwsvhgM9IHvBnC2DD5nIe0ClyM2yRucgTWDxB 4v9N1MLftRtuG1tmdFU3O/sb9f5KN377DWHO7iwXs4x4N1lvUod82v8x9kB8fnmn pGg4qpB3LSGqKatJ2/6RFVh+hl6R5HV7t9+yr1f+KByUJVqjZsrclzXcgfIo3BHZ SmDdzB6vjpidjRZldJPCnoURlib3eH0JXJSu8eIcnW4HOlhJWZ8Z3mOBmSh6GnjZ 4Wgop2TUpeqf5AylxN6iFfE3O31b5cc8Qluw811vknZB2LaCukiO59S17RyUxVaO vH3DWA3Qp7z0ZEGXaNi/qwwJACSNQZq05aem4GA2jcc6rrwQVRpn5shJx1On1xJR b1XrtYy1U5D2zinkDak9mayycpj4mNcHztLODvgUxnMe6zUvZ+Dpy47BTAf2m4kq svD8ortCb1r2cESNWKxKLrnhGnu5hawtO0HF5NX1XZt61jmIHQF4KIwsbSpZqS2y x6BqgRTzCl905US/5VaXBACtqwjrdBdin1+r2ye8clSp24G6QUymNLQItcOH3if6 fC6NwquHuQ== =spj4 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 10:26:29 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 15:26:29 +0000 Received: from localhost ([127.0.0.1]:37786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiEdB-0002lP-2B for submit@debbugs.gnu.org; Wed, 12 Feb 2025 10:26:29 -0500 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:44050) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tiEd6-0002l7-Fv for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 10:26:25 -0500 Received: by mail-pj1-x1042.google.com with SMTP id 98e67ed59e1d1-2f44353649aso10252751a91.0 for <75145@debbugs.gnu.org>; Wed, 12 Feb 2025 07:26:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739373978; x=1739978778; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Dm9v3v7GLaRyYwT/TDJtL4FogJ1hrL/3ue7FM1/cZA=; b=hFvK90uLN10jR0wkwfCju4qP+KR84qZrDK56+cNVWrmolRoSxb+Q8HixjQ8Wo5eA9b 695ivKblbsBfLlRwc4uzLdZOUIjmxiBpmd/ofJ+0/Qakmm3dKLSxhE5MqykKbSd8enHk zKSm/C8R/If9KYjukCQDlbkVhNG9Se7py6Nl3bX+W2JSCMRpGsYc5nVlNxfpGjymNEok j4M5Hrvt48s+2K1K8ddfMGOHjO5W7AUVbTx2ZcKM8qMCHKU5F6dQW/1DV0Q14RWo1QI2 8GfDtevN+dXW1lZvwiK6+BNR5q/ED5fROaZCwcdmq41GahMQFlS46ckR2OGYC7sgmVKw So5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739373978; x=1739978778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Dm9v3v7GLaRyYwT/TDJtL4FogJ1hrL/3ue7FM1/cZA=; b=dPc52up/DQU3N+N+klzXSIX+C5Wb3lXe/sTkTmtrc/XhnhcTZPmm//tiG8+A1AwShN KKi+uHBerhVSejeQRPGk8Rs1VHijvInDANMNEL7/wu/3qQXa4Z99iKuccQRSwEnkNON3 o0qKhDeTP01reGPn6RuqsQn5Nwep2NNRX6FbdvdHfEqWQeqW9mC22eTsQi5KJUIzYLi4 i/nTcUL4gnTwbEVqffZL7s3JNubviP3vv/If5ibBhV/cD50b4TOrwaOhMwqxbv4Rjjkk JqaNtYP9zzUOBrkwxqCx9jNmyGitx315lvRoLfmvdYxNERJEIuyyVZ45hNiZCPSFYcC8 deiw== X-Gm-Message-State: AOJu0Yyxsvo0NRRvsncmUXKaVcZb/56q2w4oFtnW0yvQ3JErotS/BMCY jbBXNys/DOczr1E++EMnebclZstfKze9uLmcWNkheyQzsRjUS4C1 X-Gm-Gg: ASbGncvV1QynnPq2rjXXvKiHDkDLN5AgGOOvb+It7C3VB88O5fMgieI7O6XU0eXEg97 YUyLprARV1CzrGcPiCqeiyaXn7Hq0XSLd5Eq45H0LrGCSsKeiiy8Oo21TLo1hwUN9+aOKQ/g5MA dBKMduzunmWcCnt2gAFEWM4GAG2hJxTTmvKz80EsIxJ5FUwduSZzGh5FwK+fM4gb1kvj7hle3aP vSeWB3N4BF6hYeI7rjcDxt/q3u4f240CDZTxs7pcL3UVL3I1iST9okzt5juvU/nOW84XwkmzAsj /Gkrm7witLkbY8cYhjWVD/qDcAjtLnPV0YDn5Q== X-Google-Smtp-Source: AGHT+IH+4tfjFqTkFEQRyzabtVV5PXtZ0jZ3QseMFDeHfrs6JU0D/io6aQwjwrhXKNTDGWKjSPgTDQ== X-Received: by 2002:a17:90b:4b06:b0:2ee:f687:6ad5 with SMTP id 98e67ed59e1d1-2fbf8957f05mr4879118a91.2.1739373978096; Wed, 12 Feb 2025 07:26:18 -0800 (PST) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fbf98b54e8sm1756363a91.12.2025.02.12.07.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 07:26:17 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: Arnaud Daby-Seesaram , 45mg <45mg.writes@gmail.com> Subject: [PATCH v6] services: network-manager: Add extra-configuration-files field. Date: Wed, 12 Feb 2025 20:52:52 +0530 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <871pw3i5vk.fsf@nanein.fr> References: <871pw3i5vk.fsf@nanein.fr> MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Allow users to specify additional configuration files for NetworkManager. These files will be added to `/etc/NetworkManager/conf.d` (NetworkManager's default configuration directory location). * gnu/services/networking.scm () [extra-configuration-files]: New field. (network-manager-activation): Honor the new field. * doc/guix.texi (Networking Setup): Document the new field. Change-Id: I07479958e4d0aa318328c666a9630b779230b300 --- doc/guix.texi | 24 ++++++++++++++++++++++++ gnu/services/networking.scm | 13 +++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ce780682ed..d71bed7838 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21635,6 +21635,30 @@ Networking Setup (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN. +@item @code{extra-configuration-files} (default: @code{'()}) +A list of two-element lists; the first element of each list is a file +name (as a string), and the second is a file-like object. Used to +specify configuration files which will be added to +@file{/etc/NetworkManager/conf.d}. NetworkManager will read additional +configuration from this directory. For details on configuration file +precedence and the configuration file format, see the +@command{NetworkManager.conf(5)} man page. + +For example, to add two files @file{001-basic.conf} and +@file{002-unmanaged.conf}: + +@lisp +(service network-manager-service-type + (network-manager-configuration + (extra-configuration-files + `(("001-basic.conf" ,(local-file "basic.conf")) + ("002-unmanaged.conf" ,(plain-file "constructed-unmanaged.conf" + "\ +[keyfile] +unmanaged-devices=interface-name:wlo1_ap +")))))) +@end lisp + @end table @end deftp diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index af28bd0626..c93ed58cf5 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 muradm ;;; Copyright © 2024 Nigko Yerden +;;; Copyright © 2025 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1253,18 +1254,26 @@ (define-record-type* (default '())) (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) - (sanitize warn-iwd?-field-deprecation))) + (sanitize warn-iwd?-field-deprecation)) + (extra-configuration-files network-manager-configuration-extra-configuration-files + (default '()))) ;'((file-name-string file-like-object) ...) (define (network-manager-activation config) ;; Activation gexp for NetworkManager (match-record config - (network-manager dns vpn-plugins) + (network-manager dns vpn-plugins extra-configuration-files) #~(begin (use-modules (guix build utils)) (mkdir-p "/etc/NetworkManager/system-connections") #$@(if (equal? dns "dnsmasq") ;; create directory to store dnsmasq lease file '((mkdir-p "/var/lib/misc")) + '()) + #$@(if (pair? extra-configuration-files) ;if non-empty + `((symlink + ,(file-union "network-manager-configuration-directory" + extra-configuration-files) + "/etc/NetworkManager/conf.d")) '())))) (define (vpn-plugin-directory plugins) base-commit: d59a13b6401e7494d8d5c9c9f66df3318451be79 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 10:31:16 2025 Received: (at 75145) by debbugs.gnu.org; 12 Feb 2025 15:31:16 +0000 Received: from localhost ([127.0.0.1]:37795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiEhn-00031G-UU for submit@debbugs.gnu.org; Wed, 12 Feb 2025 10:31:16 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:51202) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tiEhk-00030z-Sl for 75145@debbugs.gnu.org; Wed, 12 Feb 2025 10:31:13 -0500 Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-21f5660c2fdso105042415ad.2 for <75145@debbugs.gnu.org>; Wed, 12 Feb 2025 07:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739374267; x=1739979067; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KKWeBekXGY0hLeSSBLU0CCe4YnIdkg+sK1xuMZ8hk+Q=; b=TgCgjcOBlIkHXohvkPjdq923jdZNE81hZp7LQLd4opFs1W7EYoZNkFvskdVx+wMyHC zXjCYaAnsyzgJzwin2veUBC77yUFkbHg+jal3kqH0WlP89lAFH6GfpArQFgcsIkjH05i v503VD8w68c4HdOCbc7MbXP96Y2h/2lK3m93V3YhkVYa5Dx4iXViqZl/yzIBrj7HVe9M wyo8IaJcBO+ZinOk3yy9r+OsNxDjdqiJoc7YAgQFb1UXhgLejDS/pmDDJFu/jlcT3JGy Z7OwXjkh92871czEmjt8dfET4kCOscDcLqhk/8uLTfzNqrK9KG2vZTQzrj7F7D/lxAEL gT1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739374267; x=1739979067; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KKWeBekXGY0hLeSSBLU0CCe4YnIdkg+sK1xuMZ8hk+Q=; b=YWl+qwqdWsI0CTQEikowSD7PXtf83u//8zOffXhLK/usTBo+51sPtEBXZF0UfnOOOx lUKnIde5yNQmpZiWKoc8h450PjbBPle7eVDbErhO8j8Att8s+3OKAfDTGcTQcJBnVHrN EQnyOuO8/sjy2FhPlF3UH0+SdQPQZGLWxoTZorzBwH5EtG7cg5U54atu6Etv5yRvbXLm cn1yQhsZTcFWEtvOdjp4KPBpDdjcL9gJHbesPcugNgTQOdvHUgJ2EdB85JkfYjh0wD+g L/itcgnFZWOR2OnObfJpLJIEP2VhleDKXuXSuBSReevjVKvQwgYTQZCTstZ7DHUcXugX EGRg== X-Gm-Message-State: AOJu0YyR7JKfpqMLP08vLO4KYpzC4hp/FrLZSxr3Ell3GPTTv2bZHJvn 0A7kpCtJkefPtE9OYDGngAB123zWaXSxWKEjMQbtKZTdNdxEPn4q X-Gm-Gg: ASbGnctBYZ2JFBu1Hu2y4mTuvUw/fsiQz+rkBoJwb6zZUcVr1J7XdJbSr5zLp4nCB3i 6/yNYiWf1i0Gky5wBzRfxHicjX3TKlfK/iEYKk3fFJidV3pXpGo98/tzMbPDOd9jheDx26Cga+l PHTd0VlAILEZVJ4wBCMFwHBSVZnTd7DgJ0wTiZ+8vLjbxyJHHbpUz3sJdj8u/XXiGext+JoC0JD HW29TAVWOODQwoGGU78XeETbkN3v3ARhIlFP51LHtgEZWPh6PMlI+qPDJzV2mAQAydJO7T8MxP+ nmnpz9Cu70ddCLob X-Google-Smtp-Source: AGHT+IEPukVomintqq4JIfsWnjga1t8jpQHfK4JmN+dcrMAP5NaRvFVyob1hqt16muAZr9k66OxiNg== X-Received: by 2002:a17:903:1c8:b0:215:a60d:bcc9 with SMTP id d9443c01a7336-220bbb1135fmr58625095ad.2.1739374266540; Wed, 12 Feb 2025 07:31:06 -0800 (PST) Received: from guix1 (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c6bfsm114618265ad.191.2025.02.12.07.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 07:31:06 -0800 (PST) From: 45mg <45mg.writes@gmail.com> To: Arnaud Daby-Seesaram , 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v5] services: network-manager: Add extra-configuration-files field. In-Reply-To: <871pw3i5vk.fsf@nanein.fr> References: <87bjvkkfmm.fsf@gmail.com> <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> <871pw3i5vk.fsf@nanein.fr> Date: Wed, 12 Feb 2025 15:31:11 +0000 Message-ID: <87bjv7w56o.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 75145@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Arnaud, Arnaud Daby-Seesaram writes: > --8<---------------cut here---------------start------------->8--- > (service network-manager-service-type > (network-manager-configuration > (extra-configuration-files > `(("existing-file" ,(local-file "001-basic.conf")) > ("constructed-file" ,(plain-file "002-unmanaged.conf" > "[keyfile] > unmanaged-devices=3Dinterface-name:wlo1_ap > ")))))) > --8<---------------cut here---------------end--------------->8--- > > adds files named "existing-file" and "constructed-file". This is the > expected behaviour (explained in the doc). However, the example is > introduced by: > > --8<---------------cut here---------------start------------->8--- > For example, to add two files =E2=80=98001-basic.conf=E2=80=99 and > =E2=80=98002-unmanaged.conf=E2=80=99: > --8<---------------cut here---------------end--------------->8--- > > This may seem counter-intuitive to some readers. You're right; fixed in the v6 I just sent. I tried to say so via a patch annotation, but for some reason that didn't work. So I'll say this here instead: thank you for the very thorough review, and for sticking around for six revisions :) From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 11:05:30 2025 Received: (at 75145-done) by debbugs.gnu.org; 12 Feb 2025 16:05:30 +0000 Received: from localhost ([127.0.0.1]:37914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiFEv-0007iw-Na for submit@debbugs.gnu.org; Wed, 12 Feb 2025 11:05:30 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:50337) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiFEt-0007if-NR for 75145-done@debbugs.gnu.org; Wed, 12 Feb 2025 11:05:28 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-220c4159f87so11290645ad.0 for <75145-done@debbugs.gnu.org>; Wed, 12 Feb 2025 08:05:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739376322; x=1739981122; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=S5k0aNCe3VaFE8WP7FDw1tlox/ZS9peeZ5OcO5EnWoY=; b=cdYy5neN02P/ZT+k+yO+iVgHnkQY93LpWHiszbouwOMbEWd4m0MIpisCPINiFvg5Io kVtnaakiUTCTN5t7H0TietUWYm+MJu95l9RtkKZ9z79Q9EOcIUSndkzNnQMqTRKxWxLo mWVuH7m+y2/TEMZl0pf0Rx5vFO9vl3Vs7Dfy3dddNva4LEjH2lg9kbEh4Do+3F4lPo5K gzSn0+oJWcjqeS2u0PTtaBttF8rB/MjjHiIWgWSdQvpCX7HKmsDKbSBZZViwgdrI1o+O W3EV1iDCz3wLUaCvhc5mcabdUGl/i+z2eOtoCLb+Sc6CxboHrABy2zLjmzu0a59u4Wzv tl0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739376322; x=1739981122; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S5k0aNCe3VaFE8WP7FDw1tlox/ZS9peeZ5OcO5EnWoY=; b=dS9a2Pu2NTCNvApjuUm8O0qtIgn5tU/Bnx9WE5eNcLXYd9tr0XQ2p/wfVYM4HSi0qO aqqNVi+3gH4T197vPImPTTCD4pzbvXo/RpR3ppZWiP0db9QixSaM8FLbzASUOf1aDIKc CYU5uXpxsy2rEC004WsF3J56Je2XTDqC1cO7pb8MID4BYUi0jqlxg7wsNVZDW5X8CUal 8qD9z/2W1C6sHb7G6Esu6/ahXJwBp1A/0wmCSnTQCBaQX2L45IBtP1G3pbRdOJsIM1t2 /NYqnjmQikPoRH5nrKa+fTgaqlSyg1pfWAm9Ml+VeltL64rf6qxEAmLQKW+8YC3RzUUO J/5w== X-Gm-Message-State: AOJu0Yyy9oPy7HyOgQMsthHAWDC6yJisr2Ob5eDitbR0ZRssUl1XoZIX nfL9k4CXvXjO7gAbkaWZou7EoZGMrkmva1gruP2wjgIWx4/RFxdP X-Gm-Gg: ASbGncs70UGvTi2wyAoM+Ppbr6Vz49a08PKgRPNi7DEmbfOgZ4QmHGoRAb0DqoeTyEo ufmn5gVBDj0AigtxuLldlkjh3xRnvYYnszPit6RuTJGOgO5Fpr/dSwy4eE75pdB+U8XRzTXRcfw Slkh04bUQeOFsmzAt8trgegzY7r+HZingrEnKF8/+zcCkJkTW5uAVVLhGD0YNQHAft8Y8pvnnKZ /I9AmcmgyS8NvMqGapSDa0iRuiNhIKKsTeCr8Hp9oWzRbPBW83cAvJfSYxqQJXDCu3pEQQHTIUs SIJpSv7FuYzp X-Google-Smtp-Source: AGHT+IGtS2fVOrPZ1cXP9oaeo5enBsj4YGUUJXZfRFxsj9ORXn10MzKEvlV85F6NWnMk0Ma4fUjx+g== X-Received: by 2002:a17:903:2f92:b0:21f:61a9:be7d with SMTP id d9443c01a7336-220bbdd2580mr54507715ad.49.1739376321632; Wed, 12 Feb 2025 08:05:21 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f93c7e363sm57293475ad.94.2025.02.12.08.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 08:05:21 -0800 (PST) From: Maxim Cournoyer To: 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v5] services: network-manager: Add extra-configuration-files field. In-Reply-To: <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> (45mg.writes@gmail.com's message of "Wed, 12 Feb 2025 15:39:22 +0530") References: <87bjvkkfmm.fsf@gmail.com> <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> Date: Thu, 13 Feb 2025 01:05:09 +0900 Message-ID: <87pljnno7e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145-done Cc: 75145-done@debbugs.gnu.org, Arnaud Daby-Seesaram , Ludovic =?utf-8?Q?Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello! 45mg <45mg.writes@gmail.com> writes: > Allow users to specify additional configuration files for > NetworkManager. These files will be added to > `/etc/NetworkManager/conf.d` (NetworkManager's default configuration > directory location). > > * gnu/services/networking.scm () > [extra-configuration-files]: New field. > (network-manager-activation): Honor the new field. > * doc/guix.texi (Networking Setup): Document the new field. > > Change-Id: I07479958e4d0aa318328c666a9630b779230b300 LGTM. I've taken the liberty to apply the following nitpick edits: --8<---------------cut here---------------start------------->8--- modified doc/guix.texi @@ -21639,13 +21639,13 @@ Networking Setup @item @code{extra-configuration-files} (default: @code{'()}) A list of two-element lists; the first element of each list is a file name (as a string), and the second is a file-like object. Used to -specify configuration files which will be added to +specify configuration files which will be added to the @file{/etc/NetworkManager/conf.d}. NetworkManager will read additional configuration from this directory. For details on configuration file -precedence and the configuration file format, see the -@command{NetworkManager.conf(5)} man page. +precedence and the configuration file format, see @samp{man 5 +NetworkManager.conf}. -For example, to add two files @file{001-basic.conf} and +For example, to add two files named @file{001-basic.conf} and @file{002-unmanaged.conf}: @lisp @@ -21655,8 +21655,7 @@ Networking Setup `(("existing-file" ,(local-file "001-basic.conf")) ("constructed-file" ,(plain-file "002-unmanaged.conf" "[keyfile] -unmanaged-devices=interface-name:wlo1_ap -")))))) +unmanaged-devices=interface-name:wlo1_ap\n")))))) @end lisp @end table modified gnu/services/networking.scm @@ -1255,8 +1255,9 @@ (define-record-type* (iwd? network-manager-configuration-iwd? ; TODO: deprecated field, remove. (default #f) (sanitize warn-iwd?-field-deprecation)) - (extra-configuration-files network-manager-configuration-extra-configuration-files - (default '()))) ;'((file-name-string file-like-object) ...) + (extra-configuration-files + network-manager-configuration-extra-configuration-files + (default '()))) ;'((file-name-string file-like-object) ...) (define (network-manager-activation config) ;; Activation gexp for NetworkManager --8<---------------cut here---------------end--------------->8--- I hope that's fine. Finally pushed as commit 0caba8f5db! Thank you for contributing to Guix! -- Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 11:06:45 2025 Received: (at 75145-done) by debbugs.gnu.org; 12 Feb 2025 16:06:45 +0000 Received: from localhost ([127.0.0.1]:37922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiFG8-0007lh-Uy for submit@debbugs.gnu.org; Wed, 12 Feb 2025 11:06:45 -0500 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:50354) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiFG6-0007lS-74 for 75145-done@debbugs.gnu.org; Wed, 12 Feb 2025 11:06:42 -0500 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2f42992f608so10705376a91.0 for <75145-done@debbugs.gnu.org>; Wed, 12 Feb 2025 08:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739376396; x=1739981196; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=janFkqhtU7aFjEBz5rPihpqDNLEPQk/iebpsBrh7vxg=; b=Q6x5zE1j+1CAo8/Gj1edvyt91wiTG/xSO2/VaANbrYy9RD9DfY0wQfS0zYRCIaLEX+ S/6nHCDn5UueJIcR3oR1s/aMPyXBq5wPef3DY66jcpnT5kfn9RDZ/16iOPAXhIfc9l37 mfqUeonaH8seU7Ct7grb2IuuI/o/M7oI2RkwDOQJiNIwpDZe25gb8RP2K685Vbo10SVY 0vXv3FsHPKsYDl1Dv89VHEuOBGF4wyE0fma/g2AE9t38qHrS3tB8ZOY5qYm7+3d371pB fN66lb9b15o9e2pYUQiyhmWUveZLMcS+MpTI+j3OIZ8WaAvg3oBlZq7TLp5QKoT6H/0P ugkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739376396; x=1739981196; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=janFkqhtU7aFjEBz5rPihpqDNLEPQk/iebpsBrh7vxg=; b=ImNSzaCqUEPcJpbaVXkFhdwdfssMd/EJ8Bd7ssrS2NfMYmTJfQjxu6GmbghP0xLNtX sgtSlWkxzskttas8uJJyaWJcpeYt/R0E7qL0aWXQH/txhBPPJPWGL7YdWfjq9SYAuQsp c8TSEiM+K4aC/Ah9XClztVradxW4xDkrgjBQuc/0BHemPH1Tiu1hb6U80yggvrOv3KO/ N/OIn70tPmGMOWsSg7FqxFVq0I8+uMiNRSYBL1sgwrdsMMhYVulwGc8aYEoyxz+GZMFE k5e5rbnU636VMIk++2opZoTNv9pHP4DdXfyV93KbprMuTDBjzhGqAeqKrYmU4OS3ccUH sQvQ== X-Gm-Message-State: AOJu0YyThWx3VbB+n3RhIQacW6G7BRa3Tgztgm72sQamq+C/adixPfQ9 k7rSuWNPdbFIaSK156kJeZTqlVtTHg8B4dT+QL1vVLp9eHZ+XHUdkvtj2g== X-Gm-Gg: ASbGncsB+YKGSCE3ybJQMQfi1alRq+otHt+qBX0u4uC7oK7KoGlbtjc65I4DoOCgFth mcKo91DM5PFjDs57fFvx9SLjL4YklpT5aRRhqMg3uR5ikrNBZt5K9NdO8BfGZSoAUu1AwbC2oll uIr2QPsENIRNJdxONGalenv2r2E1FXIVgYzNtIwNmSaO3gra1SThTxL/DtVcNlh60GlKge7rkP4 BuanxwxiqjUvtc2BoEc9LRVIQgURQeWBORj4B/JN2RdcxKKvPNyjp3TC4QP7a0p5oJJodcmNj/E p/oNX9NyF6Ys X-Google-Smtp-Source: AGHT+IGuKF4sDjocmxjQ3/6nKbvZOhVU8pG7lt5X8Hs8udzxYlk/nyt2aO32TzVNDABMSyV963Pjtg== X-Received: by 2002:a05:6a00:4b12:b0:730:9502:d564 with SMTP id d2e1a72fcca58-7322c39a2e4mr5637915b3a.14.1739376394360; Wed, 12 Feb 2025 08:06:34 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7308f46867asm5656969b3a.0.2025.02.12.08.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 08:06:33 -0800 (PST) From: Maxim Cournoyer To: Arnaud Daby-Seesaram Subject: Re: [PATCH v5] services: network-manager: Add extra-configuration-files field. In-Reply-To: <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> (45mg.writes@gmail.com's message of "Wed, 12 Feb 2025 15:39:22 +0530") References: <87bjvkkfmm.fsf@gmail.com> <33af7378f90f4bea3a4b09fe65ef967edee28433.1739354962.git.45mg.writes@gmail.com> Date: Thu, 13 Feb 2025 01:06:21 +0900 Message-ID: <87ldubno5e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145-done Cc: 75145-done@debbugs.gnu.org, 45mg <45mg.writes@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi again, Apologies to Arnaud for failing to add a Reviewed-by: git trailer for their review here. Thanks to you as well! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 13 00:33:36 2025 Received: (at 75145-done) by debbugs.gnu.org; 13 Feb 2025 05:33:36 +0000 Received: from localhost ([127.0.0.1]:39556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiRqy-0001I7-Fs for submit@debbugs.gnu.org; Thu, 13 Feb 2025 00:33:36 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:51565) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiRqw-0001Hj-13 for 75145-done@debbugs.gnu.org; Thu, 13 Feb 2025 00:33:34 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-21f49837d36so5319925ad.3 for <75145-done@debbugs.gnu.org>; Wed, 12 Feb 2025 21:33:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739424808; x=1740029608; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=AU638PNBTAM/Mvn37gjMK4Zm/DbS7nhOEpVVC4c0OnM=; b=aN/3qvE6/lz/NithVwTdaYzUBXrWEbSK5Ga5eFf+eR5NQyuhuj9Qivq407DG89uaZ3 kDbsXV0ljT4yNcwThlpRoSk9ZNX6lI4p6Jonn+d67J1iXJW9mtLjRf2jEfXowkkrtYMG UfPU4O8/cb4YDPbLP7XoLlUKjZ1Fw8qVtlx1OWRnJ0dVMJg6Mqu6TjkiTcEuss5ux27f mxCkNYX7atq+etCtcklS14ZmO289QGBJyWWmAUARTKsu+5tjilkfKc1QNn7CCD/zYPjZ XpOZO56zmPT/QUFcQq3PlpHcArPOl5OItMfVeyJ6uj1G29JKT5a2QVMrPaDNU/6RSRNC DYRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739424808; x=1740029608; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AU638PNBTAM/Mvn37gjMK4Zm/DbS7nhOEpVVC4c0OnM=; b=CYgr00wnpZn+58sQRyJZN4nSHZktdopzL4y2HLYUM+a1y1zlLJUj3tbVMV+J0kiLCR j7oeq+lZ0kp0xqbW/fTro+2CY9Ke285Jm0HVASHxjoxeaVnf2/F/6g6Ad6mg2hS6ULND gO22P4j4uZrCZvqc1qn4Sb3Y86TKbqEVMeg0kPAjLS5XGCGnITU/cheW//dDRIeQbefS x/ksYicPQYAutPA84y9RddryXYQalKvBxWC1Yyfmh9Q6WWx/K+osUhbdTjjkw5EWB5SV ALYn6A1s+93zzJj2TGrMLHOATWQ0FwSHTgD1nonYriKSlX7Ht7N+HQiX0Uu2mv21mSOE 9nEw== X-Forwarded-Encrypted: i=1; AJvYcCXNzJ0I93RfDp8w9lE7WLNIPoR3NvykDYlDKIdX9p2a5jb6qno3BrjYwP75WjUiRs8QJH2v2ztD2I4s@debbugs.gnu.org X-Gm-Message-State: AOJu0YySTChpIqcvbnh8wBTVqYNYQnIDY3Xlu6k+gy2jVQhwpFqt5qhx ALIwx+MkGYVQmsa91yy6zX0D4cCJMbBFfg4EKgwFnQVk2OFgxYF9 X-Gm-Gg: ASbGncumWRmkM4cD0Tq2GRWPgPbIJsS9PVXpTBB5nxXCgSWLKTJbix8pgGr7WHLsISR LOYUpEYF61F+em7rs324Id20KgdwHQDjJBUTaK0CWQdjuutyHq40Cm+DwF/xM0QUPHVoCn3Yaou w4oB9YC97TuETl1TG143bmXdZrkRRQObxyWscBzSorxdL+Q1GEuh14v7u8ZXyesnp0dYD8zMfaR kQKe8gKk4k5WgtPGD0p+Pp0iJAcxS/WtNEMgXGpKfCT1howR8ziULv9WbOPwmdGYrG1FncKOS+6 WEDdlsaClVH4 X-Google-Smtp-Source: AGHT+IEHFwmRSj977Hbpzz0OUfsO3uCUO1Xq3BMIN66qQ1mT6c4XhDaNve86nMETmg28/mccP3+j7A== X-Received: by 2002:a17:902:d552:b0:21f:55e:ed71 with SMTP id d9443c01a7336-220d1ea0968mr34889755ad.5.1739424807815; Wed, 12 Feb 2025 21:33:27 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5596133sm4218135ad.259.2025.02.12.21.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 21:33:27 -0800 (PST) From: Maxim Cournoyer To: 45mg <45mg.writes@gmail.com> Subject: Re: [PATCH v6] services: network-manager: Add extra-configuration-files field. In-Reply-To: (45mg.writes@gmail.com's message of "Wed, 12 Feb 2025 20:52:52 +0530") References: <871pw3i5vk.fsf@nanein.fr> Date: Thu, 13 Feb 2025 14:33:14 +0900 Message-ID: <87bjv6mmsl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75145-done Cc: 75145-done@debbugs.gnu.org, Arnaud Daby-Seesaram , Ludovic =?utf-8?Q?Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, 45mg <45mg.writes@gmail.com> writes: > Allow users to specify additional configuration files for > NetworkManager. These files will be added to > `/etc/NetworkManager/conf.d` (NetworkManager's default configuration > directory location). Not sure if you noticed, but that's already been applied :-). So I've cherry pick you v6 doc fix and pushed to it to master. Seeing it, I also remember something similar we have for adding pulseaudio extra script files. It has a extra-script-files->file-union procedure that takes the file-like objects and extract the file n ames from themvia the nested file-like->name definition, which could have been used here to avoid duplicating the information. I'll let you decide if you'd like to use that or leave it the way it is, which is also fine. -- Thanks, Maxim From unknown Thu Aug 14 21:22:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 13 Mar 2025 11:24:18 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator