X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: 45mg <45mg.writes@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 02 Mar 2025 18:33:02 +0000
Resent-Message-ID: <handler.76688.B.17409403739714 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76688 <at> debbugs.gnu.org
Cc: 45mg <45mg.writes@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.17409403739714
(code B ref -1); Sun, 02 Mar 2025 18:33:02 +0000
Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 18:32:53 +0000
Received: from localhost ([127.0.0.1]:35045 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1too7Q-0002Wc-TI
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:53 -0500
Received: from lists.gnu.org ([2001:470:142::17]:48314)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <45mg.writes@HIDDEN>)
id 1too7N-0002W3-6e
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:50 -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@HIDDEN>)
id 1too7H-0002UR-Ln
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <45mg.writes@HIDDEN>)
id 1too7G-0002yH-1S
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: by mail-pl1-x643.google.com with SMTP id
d9443c01a7336-223594b3c6dso60893005ad.2
for <guix-patches@HIDDEN>; Sun, 02 Mar 2025 10:32:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740940360; x=1741545160; 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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=KkAKh9/67MnlOyEiJeetC61cyKMiXx7vJVQR51uLfe88QqJLnSkyUpCuFyAsjykeNL
GmhS6lVScEgNYHWRommiMxjrXrHtpQlY14w/4RrILUypSAv4HyshGvVbbu9cCyhUFdeI
XeNCG8iPrcub/fYNZtNeOpiQ9f/FNyE98ieSR5VATJqahtvqqKdM/sjOkLIsSLOiAu+s
sRxykCefaGqnIf/9M3xO0xV97BxvvH5lW6GI0AYc6YZLUG7nsOW/cpKZiucVE7whHxDw
GYuL8AZS7sPxoHicsor6jjhTVaWGnSNnIOyAMccvUkYJdJiG33imYWBiA1eHz/2mRkwk
UOGg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740940360; x=1741545160;
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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=tFTQuGkQipzfw4cdiB6bNY4z3n7TCc8UVy0FIpVd6WEKFzd1Z1B4GHKoUc0paVHqcU
n4ZO8FRMPX1/jmstoD1g2mEnHPGWksJEYGszKCVmY/Wlan9LgShuiC1XW1jFRouK0jtp
aNnp0/yeV7uZl3cpfFh9aFwp1+4lfoDKU/MU4ce9ERZsqrD4i9K4uxpM7A5C7/U+f3YG
rxNbBzBp+Mk7rBg/8zkGNV5EV3F+QTqn9+wq2xUlg5ufTbJlZm4f++vfdSCJd83QIz5I
+/AP+8MvitbGEuOgQjEx1bTOi+fA9slBHiMYYdNIk2mfAy3RAC1YIhVD81MsIBcdY2cG
M7MQ==
X-Gm-Message-State: AOJu0Yz7gm1ceVi5G2MP/Pmnwlrd2fzvwogAEb1DE39XaJGMup1vdB6q
YC/tXNAINAEyRP2CidzzcddKmbi/NIm3SIJVADnrAhOB7bXPvZnb+xHpnm1O
X-Gm-Gg: ASbGncvwthQLxIRxYX5SETZyMgMPhC1ia/D1xA+htG5KJ3NMgzhdg0xzkiXpSTJHo+l
HkNqpPS/7ryfyw5cYLEXbrYFaDC36nVVjxdwxcSXhYwsgSDqHLJkSJZ977psTRwoGpTc+PDBSq5
gFbmiBxgOWFPKC3gNnEo4M8tGND+fA5Qof2SVvkSJv7UKADTKMhRxeQEdqvtGuiot/02MVDx7ir
Qd5qHH1lnHp9qpBPT70JnFhiVAsCGW28fJe0/l2lHw43iJ3wMHckL2CT8aeGuSTUQbTZSkFQcZ1
GaiG/fdY20RdRr42vP1g+n02bKxSTtiJXYJ+EdHOP/kdUyLjD8qpz1/hxkNTlopWpPk=
X-Google-Smtp-Source: AGHT+IHEKy03zaDU6hEWFgvtKqLFawUbhrU+aIGvYLWSv+I8hHr/9u1Hxk2MkdtmZIoUeRBrV5PAfw==
X-Received: by 2002:a17:902:ecc8:b0:21f:61a9:be7d with SMTP id
d9443c01a7336-22369223651mr191769375ad.49.1740940359636;
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-7364ce34233sm1136700b3a.63.2025.03.02.10.32.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
From: 45mg <45mg.writes@HIDDEN>
Date: Sun, 2 Mar 2025 23:59:49 +0530
Message-ID: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::643;
envelope-from=45mg.writes@HIDDEN; helo=mail-pl1-x643.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.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/services/networking.scm (network-manager-activation):
Handle the case where /etc/NetworkManager/conf.d already exists.
Change-Id: I7af4f4ad226eef28bd8667f0708525e77a6a50c8
---
Follow-up to 0caba8f5db48c15a2c3edae37e816654246fa986.
This issue only became apparent after pulling the above commit, changing my
system config to use the new extra-files field, and reconfiguring /twice/. This
sort of thing is why I now pull from a local fork and apply patches to it before
submitting them ;)
gnu/services/networking.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 53840c2764..45efea330b 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1271,7 +1271,18 @@ (define (network-manager-activation config)
'((mkdir-p "/var/lib/misc"))
'())
#$@(if (pair? extra-configuration-files) ;if non-empty
- `((symlink
+ ;; If /etc/NetworkManager/conf.d is a symlink to a store file,
+ ;; delete it.
+ `((if (and (file-exists? "/etc/NetworkManager/conf.d")
+ (store-file-name?
+ (canonicalize-path "/etc/NetworkManager/conf.d")))
+ (delete-file-recursively
+ "/etc/NetworkManager/conf.d"))
+ ;; If it exists but is not a symlink to a store file, then
+ ;; this will fail with EEXIST; we leave this for the user to
+ ;; handle, since they probably created the directory
+ ;; themselves.
+ (symlink
,(file-union "network-manager-configuration-directory"
extra-configuration-files)
"/etc/NetworkManager/conf.d"))
base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
--
2.48.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: 45mg <45mg.writes@HIDDEN> Subject: bug#76688: Acknowledgement ([PATCH] services: network-manager: Handle existing configuration directory.) Message-ID: <handler.76688.B.17409403739714.ack <at> debbugs.gnu.org> References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN> X-Gnu-PR-Message: ack 76688 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76688 <at> debbugs.gnu.org Date: Sun, 02 Mar 2025 18:33:03 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76688 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76688 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Arnaud Daby-Seesaram <ds-ac@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 07 Mar 2025 07:58:02 +0000
Resent-Message-ID: <handler.76688.B76688.174133424812192 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 45mg <45mg.writes@HIDDEN>
Cc: 76688 <at> debbugs.gnu.org
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.174133424812192
(code B ref 76688); Fri, 07 Mar 2025 07:58:02 +0000
Received: (at 76688) by debbugs.gnu.org; 7 Mar 2025 07:57:28 +0000
Received: from localhost ([127.0.0.1]:46789 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqSaG-0003AZ-5l
for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 02:57:28 -0500
Received: from nanein.fr ([185.230.78.41]:41874)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ds-ac@HIDDEN>) id 1tqSaD-0003AF-Ch
for 76688 <at> debbugs.gnu.org; Fri, 07 Mar 2025 02:57:26 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail;
t=1741334238; bh=EHe1QsfHfJ+9KUW03pX3wG2NEtefSWcCUVZkAHyl4hc=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=h1PRF7dMEvCoADoMQKDEQMHazyLk1mry6TGMlVOVhCK38p+MOExasa6a6X4+FqOlz
Cb7BSzYICkaCrI+RmGxVZ3LDUHf+xiZ1JACOI5e1RUEG1DI2zgfmIv0uHf4ViBMFrt
MlZP9sFhkJVe0GFFH5RKBUyH7GcQ2uaCg3eP0F+m6sL5Y/hEflv/7AdfkqQROiHcvn
x28fevDw47JkNDwVbQ/f4DUVPbdzTUZhTz4mLVHOv/UzH6T0cRZPzbjhPhY4LK5w09
gjKgByv5c/f3Smp/HApCiRBcmCGIdB84pp5wRAZ3BTTzR2kMSLaxCYNV72OJNlzAtk
VkE/fVNNTHlLW6dHPnv1kkD0h3ZFfkttS4SGnaVyKfXywL4/XHIR4YmBnPbj7HNTYu
kouTSeQV8+LS7Fg2Bli+M9U+gSRNQrK/vkMll3XIMoMVlvd4DBgDDc99aMWMqsL8YU
ieLLG12B473eWGHXxumOZdPpP4UWF1gcezeNggTjbGhF31OCkri25FhBi+tmFxmeTW
jaA8uXITniabAx+4+rNtROY9NORSlnuAfAyH7i/D1Fm7ppN4i6vg7lEFtjpaE/iXkM
2n2W1Y/u1m8Vh7dREP5TkR1oFrvbMhPIAatrj7Zb0wXVhp9pjD11xIcbMA3ogFzK71
D7COb98tPxR7YsfLLvUNWb3o=
Received: from thinkpad (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 7ADC41401ED;
Fri, 7 Mar 2025 08:57:18 +0100 (CET)
From: Arnaud Daby-Seesaram <ds-ac@HIDDEN>
In-Reply-To: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
(45mg.writes@HIDDEN's message of "Sun, 2 Mar 2025 23:59:49 +0530")
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
User-Agent: mu4e 1.12.9; emacs 29.4
Date: Fri, 07 Mar 2025 08:57:07 +0100
Message-ID: <87ldthp92k.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hi,
45mg <45mg.writes@HIDDEN> writes:
> * gnu/services/networking.scm (network-manager-activation):
> Handle the case where /etc/NetworkManager/conf.d already exists.
>
> Change-Id: I7af4f4ad226eef28bd8667f0708525e77a6a50c8
> ---
> Follow-up to 0caba8f5db48c15a2c3edae37e816654246fa986.
This patch looks good to me.
Best regards,
=2D-=20
Arnaud
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmfKptQQHGRzLWFjQG5h
bmVpbi5mcgAKCRCiMspegxOIDFiVD/40UdsT2YNMYmVCvM0FKx6YZUjDSymAJqeP
jb2QoJYQdlfNg61obvoXSboLTfh6zO9H/dgilzWp/q4dNmk1+pnYu++scg0r3Klg
GRLA4m58d6VwWsoA6gCM+Gm3yVcLfzOYi14lsEkpA+91pUJShFHzlBR1FY/KI6hi
07c3iB2U5DVRQtbk3ohUJkEVwUb+eIIzuLaqOypkja/yRWv1b8gOPhGYf2t+N3gM
CHwFNw2oSAQrTtQFOkK04spD6BUhiuvsLVf9RmsUBuLd/JnFcgBibPgVpYJ3QKAQ
IhPsocSGHwrLwIn6UVjanXYPMOTykEbZ5cwCEVyXUlue+H/Q56+nrx8PhhNDn9O2
gehhnLANnc+QApD76sEboMXlGkTz2v8bry2B1J81HjHVsLbWNMnAUGigor6iCr9r
Cteu8AsWVEigH/jgvMEa3/3sRAaWE6f+ledwn7DvfM7wHzNPEIk+hQjOalgmzqs2
roeMOKHXjKHeIoa+O+HiVdLeR3pJsqegvnQbQPanCfwNpE8p98utlfOE/QFJhOWw
eVNDjopYJtJSjl9rKeUFcuBTYb0zcFxQaLAX5wXPO39yixSKkTc+6QOF7zQcgEjN
i7RjvJqsZkz79QdWsIq8gckCdQALfRqUKZR4wXY9gBDXx2bWFEG4OuaZbkirdSQu
7XZP0cicdA==
=b7WA
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: 45mg <45mg.writes@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 07 Mar 2025 08:25:02 +0000
Resent-Message-ID: <handler.76688.B76688.174133587728673 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Arnaud Daby-Seesaram <ds-ac@HIDDEN>, 45mg <45mg.writes@HIDDEN>
Cc: 76688 <at> debbugs.gnu.org
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.174133587728673
(code B ref 76688); Fri, 07 Mar 2025 08:25:02 +0000
Received: (at 76688) by debbugs.gnu.org; 7 Mar 2025 08:24:37 +0000
Received: from localhost ([127.0.0.1]:46881 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqT0X-0007SP-7p
for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 03:24:37 -0500
Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:43289)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <45mg.writes@HIDDEN>)
id 1tqT0U-0007SB-EX
for 76688 <at> debbugs.gnu.org; Fri, 07 Mar 2025 03:24:35 -0500
Received: by mail-pl1-x642.google.com with SMTP id
d9443c01a7336-22185cddbffso51471055ad.1
for <76688 <at> debbugs.gnu.org>; Fri, 07 Mar 2025 00:24:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741335868; x=1741940668; 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=BZgSUv3mrTuBcAXIXeZYzuv7szNH1ZYFNeZpISQUQ6c=;
b=EqGFYRQD5+azjWZuXBgR56eHEZTYZGV3EjveVLwDogXQokwWnf+7XNYJkuEa11dmSD
0J+JCZdFEYGWQGoniq4WRvwz0NBA7lNNRvx8BFt43B9iMux8AJbrx1dBgiI5t77w0NB1
WNsuqZXNl0h+ck9IJmBTRND+6ii7V2j0EW5llu4SIw9pWom5mT66hxg1Zv6h3j6zYDzH
yAqtkU9flZDQZMA0qCsmW4bx8RV5539QbZ+RKTYC8KSXEyF7TS4oPGhL6Fp3liKXQGVY
wjhLtrHdqhGSYD6QEQmPS9EmtSKNG0ffyzbuBy/a2H2YE3r8qYESpVSmcA7WyN/GouCT
53Yg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741335868; x=1741940668;
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=BZgSUv3mrTuBcAXIXeZYzuv7szNH1ZYFNeZpISQUQ6c=;
b=I6vseoWTCzMIsKrIVSQXTKP+GgSI3gZNi+hHkiAW0FXe8lA4PFRXKIumPG2vTVTEoV
msrsEGGSnRYKNouNsYNrPDQXQ0wFe5Wl1aPHiGfImoEQnmr+me1Vj1Wu5v3BHp214ZXo
zYjezdzYSPXusGBtTSp9IZkOyEjdM+4EiYuDFRQeUqI8VFYxXpiMbH0VEB049nAcV1bS
WSWVxF3x1XiDiXMtPxQpMmz/C4xwt/gbMLr8pnXA0Wl0/iNPl6rVK/4dI4rwl9zTXEB8
+HoWX4St8Uod05nTVHB0Gm8A9CVbCZcW6LyooIAGgTa9alc7YT8Ji/1G1ADn0f5r9ESK
ZGNw==
X-Gm-Message-State: AOJu0YylRLL6eJY6m5fVLQxbsH0zY0LuEOO9ZOSQcmhSQyaUG7lw4Bga
V5rQzuW3eHYtEd6QJ5CZYTa1jlv03dkEZVkIz8zTpKJGueT5GkeLlH8tAJEp
X-Gm-Gg: ASbGnctxgNEZTJJqpPK1SZEGrMlfkQCbdCaqlJM73izY+ooI/mrVblXPYZwPfc6NXR4
yRawFFNK08R4pxxymkyviw/6GeYdS5N6nJD+VKIVeVkSQJS0Lede+WWI3mGZMiBEN1vs6S/fmCK
CpneKdCiKBwudLBiWmHMZ+NaWE15fICmfT4K2HyGugnG3VR7Eo6M9JQC6Iq0qD87sFnv23EowHC
O1/QePB3kqYFCIwsA8qfXnQQoyCVLxXZ4bnaP+aJysti0IlB7RHLeAChNP3abT7slvv5XhbQO76
k9S0OguUZa5qnxqvrtoFHy0F/Zl/bBr63bHKjoOtK9x89w==
X-Google-Smtp-Source: AGHT+IFeREADcl1if4o1Iuz2nAI2Cwr6sMxsiD65Q7xaoOYNN3WaqoLU5+VF82SlbDcSf8qW2lACkw==
X-Received: by 2002:a05:6a20:d045:b0:1f3:2968:5ac5 with SMTP id
adf61e73a8af0-1f359c57100mr11986974637.20.1741335867568;
Fri, 07 Mar 2025 00:24:27 -0800 (PST)
Received: from guix1 (utm3.nitt.edu. [14.139.162.2])
by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-af285c60eeesm1893442a12.48.2025.03.07.00.24.25
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 07 Mar 2025 00:24:27 -0800 (PST)
From: 45mg <45mg.writes@HIDDEN>
In-Reply-To: <87ldthp92k.fsf@HIDDEN>
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87ldthp92k.fsf@HIDDEN>
Date: Fri, 07 Mar 2025 08:24:17 +0000
Message-ID: <87ecz95jv2.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hello again Arnaud!
Arnaud Daby-Seesaram <ds-ac@HIDDEN> writes:
> This patch looks good to me.
If it's not too much trouble, could you formally mark this patch as
reviewed? I think you can use the 'Prepare review' button on this page,
just check off the items and it'll automatically write the email for
you:
https://qa.guix.gnu.org/issue/76688
That way, it'll show up as 'reviewed looks good' in QA (dark green tick
icon). My understanding is that committers use that status to find
patches to apply.
Thanks again for reviewing this patch, as well as the last one!
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Arnaud Daby-Seesaram <ds-ac@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 07 Mar 2025 09:42:02 +0000
Resent-Message-ID: <handler.76688.B76688.17413405089704 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 45mg <45mg.writes@HIDDEN>
Cc: 76688 <at> debbugs.gnu.org
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.17413405089704
(code B ref 76688); Fri, 07 Mar 2025 09:42:02 +0000
Received: (at 76688) by debbugs.gnu.org; 7 Mar 2025 09:41:48 +0000
Received: from localhost ([127.0.0.1]:47022 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqUDD-0002WS-Kg
for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 04:41:47 -0500
Received: from nanein.fr ([185.230.78.41]:43104)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ds-ac@HIDDEN>) id 1tqUDB-0002WC-Ji
for 76688 <at> debbugs.gnu.org; Fri, 07 Mar 2025 04:41:46 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail;
t=1741340197; bh=UOr42C5/47w+TGMsDPryVN3oZwkuXQ7/hGwTCQTUA9U=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=v9MPtwMTjeHa+IemlbWf/ZrkSKgpqhnFitE9pbTv1sm0cqRZak8fT/BH3kPL9y5Bv
RfRUKngn3WR9eqDnGOjJBxwS+UCiY6liKKr6AFUoupzb0OaF0Bls4TFr+bM3M10KTK
jQV1ISgMb3P/GXK3BnhclTVn/4QMnmOlefrsTEqGad8HkEDr7f7eoc+EGbJ7Q25qHf
kMGxZtQJVT69zhy9zlUmSiTf172j4+Ows/kcWVdFPDVrQqJ676zd3HFbhC7/qNWR1q
9OxjxF9I/I5iPN8nevsf1EmUSmkIo5aWWLNbE63Ug8SK8bKQ5dwUurcKzoitItZiDB
7vb5UkT5zbHFxnkkFZPXR+U7ggj6NoVXaeEGukYW9el0dUUJBdZQuECgVrKAl9+ON7
n5rZRGlEBi4rftbRg86WYhzuR2wRspjgWGErdiv4JVx9dzm/5UEc3jA65qvdMHPavL
bPfVpJAG96qHN/lsTjJA9XmP/azfmDGovmLW7SCe9AO5ZBxHlWmM/hMTKsLYTPGorY
7EjY47x5RZkqJEYQor1nG99ezoRgkcb0gIEebwAxBaVogjCK1BG0C8XWojumNsqiIs
5wE2NDLSH/1a4iFT4dyPMHm2iW1tkoLwg3V6n/qZby6G73u3/yf3GhGbvAjDnOcbyi
iIXZpn/QVw9KJkJU2urbMoM8=
Received: from thinkpad (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 A05251401ED;
Fri, 7 Mar 2025 10:36:37 +0100 (CET)
From: Arnaud Daby-Seesaram <ds-ac@HIDDEN>
In-Reply-To: <87ecz95jv2.fsf@HIDDEN> (45mg.writes@HIDDEN's message of
"Fri, 07 Mar 2025 08:24:17 +0000")
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87ldthp92k.fsf@HIDDEN> <87ecz95jv2.fsf@HIDDEN>
User-Agent: mu4e 1.12.9; emacs 29.4
Date: Fri, 07 Mar 2025 10:36:27 +0100
Message-ID: <87cyetp4h0.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
user guix
usertag 76688 + reviewed-looks-good
thanks
Guix QA review form submission:
I am not sure about the commit message, otherwise, the patch looks good.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCgAuFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmfKvhsQHGRzLWFjQG5h
bmVpbi5mcgAKCRCiMspegxOIDJ/aD/9f6Wqe3GCvu97NCaE2kLn//Dd1X+IGGwP0
gqdXbetAEXxksUudfQlaHUsunCsZya05OxDFKTNRkS9VZK7u9dfTehiyv3v600JJ
c/r2daZYI4D7j9/iHNgj6OWUWRyyX8dYogUOm6G4mGtBZGkXZplMyTpAYltERtPt
a3uMv0doK1aCIciiHwbdVu0mbZVJekxd+kK2ZCaWhKFHZG0es9wSYT3Vf0hxxfqG
q0KNG2E8WuucPicSTCZt3vuk72DGNhBzhe02kS5aUDzVG0GlPsuyZaDDdybSCmYf
NPyaoI//smaqTtt7ee63jhM98o3dGa54pHtcwRYUjV7n4r9P7yY97Yb67Bfyi9gz
kkw5O4zUkDwLo2wXspu8w0SjD3biCBpSoH0AJIh9oAQ0hxZeRbcmK4Bnor3KhEZO
emhtwGGZN48gtt693d8Ndgy7yPYbo5SvHsLEuZD1E4GqgYhnPAaF+NOjr2ZZdePm
jAFUPVYJY+7XWyrZBMZo8Wg0lMhDlGld62JNgPJWnUDe/GQI24Px67dHja+xlmPR
XDiUl5qddhFnSFaBNOK5risLVg0oo0Me+0I46D4IA8dfvbjN2NTz8yK+eU6e7pUZ
NbRYdg3jKElSPJDRTxHMuOwLlOI0xTETAoLFlrncdSmMzqrkH5xWUnHAXgKl3+06
LGbPKp7/Gw==
=s9a0
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Mar 2025 06:40:01 +0000
Resent-Message-ID: <handler.76688.B76688.174262554631245 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 45mg <45mg.writes@HIDDEN>, 76688 <at> debbugs.gnu.org
Cc: Arnaud Daby-Seesaram <ds-ac@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.174262554631245
(code B ref 76688); Sat, 22 Mar 2025 06:40:01 +0000
Received: (at 76688) by debbugs.gnu.org; 22 Mar 2025 06:39:06 +0000
Received: from localhost ([127.0.0.1]:40496 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tvsVd-00087q-W9
for submit <at> debbugs.gnu.org; Sat, 22 Mar 2025 02:39:06 -0400
Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:44524)
by debbugs.gnu.org with esmtps
(TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1tvsVb-00087K-7k
for 76688 <at> debbugs.gnu.org; Sat, 22 Mar 2025 02:39:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1742625534;
bh=z9kdnUH5v4ythfwCru+t7Uc2jWWLl5gedUY7RtLWcJk=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=WcmE2wt53ZZPqSJAmY6nrjcdChyFqxaz6S/qZ+VjnxNOjvJfs65SDfikTzzyI/ciH
SDGK/Bd7PtAhmi7DLV9TuYI4FaMZFBP05RlYIO01x0MQmBM45wk7nVWe5a5rmGXf2Z
RWlVhfauU/4qPDyZz0HO8zVZtwSqR5hgbc/4+SFt8CZkSjtiZYCXidaewt++ex1QBk
0l0IuMbGuNLWQLCpZJ/2YIcqDqRQKfLyf9JUzEWTm+JiCes5rAaarw4PMsKnQNSaSg
6zk59zp2IDv+07GHSHh+B8BWWkP44c88guud5ZSthDO4/4125iGhUvyXJMLHpQAEEL
IqQ+Y3/FaTcIg==
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
by cascadia.aikidev.net (Postfix) with ESMTPSA id D545E70D3;
Fri, 21 Mar 2025 23:38:54 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
Date: Fri, 21 Mar 2025 23:38:49 -0700
Message-ID: <87jz8hk1s6.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
On 2025-03-02, 45mg wrote:
> * gnu/services/networking.scm (network-manager-activation):
> Handle the case where /etc/NetworkManager/conf.d already exists.
>
> Change-Id: I7af4f4ad226eef28bd8667f0708525e77a6a50c8
> ---
> Follow-up to 0caba8f5db48c15a2c3edae37e816654246fa986.
>
> This issue only became apparent after pulling the above commit, changing my
> system config to use the new extra-files field, and reconfiguring /twice/. This
> sort of thing is why I now pull from a local fork and apply patches to it before
> submitting them ;)
>
> gnu/services/networking.scm | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
> index 53840c2764..45efea330b 100644
> --- a/gnu/services/networking.scm
> +++ b/gnu/services/networking.scm
> @@ -1271,7 +1271,18 @@ (define (network-manager-activation config)
> '((mkdir-p "/var/lib/misc"))
> '())
> #$@(if (pair? extra-configuration-files) ;if non-empty
> - `((symlink
> + ;; If /etc/NetworkManager/conf.d is a symlink to a store file,
> + ;; delete it.
> + `((if (and (file-exists? "/etc/NetworkManager/conf.d")
> + (store-file-name?
> + (canonicalize-path "/etc/NetworkManager/conf.d")))
> + (delete-file-recursively
> + "/etc/NetworkManager/conf.d"))
> + ;; If it exists but is not a symlink to a store file, then
> + ;; this will fail with EEXIST; we leave this for the user to
> + ;; handle, since they probably created the directory
> + ;; themselves.
> + (symlink
> ,(file-union "network-manager-configuration-directory"
> extra-configuration-files)
> "/etc/NetworkManager/conf.d"))
I hit this bug as well, and it actually caused a boot failure, had to
boot to an older generation to get things working again!
Have not yet tried the patch, though it looks like it should fix this
exact problem...
But... I am wondering if it wouldn't be more elegant to avoid using
/etc/NetworkManager/conf.d entirely, instead call NetworkManager
pointing the --config-dir arguments directly at the relevent store
directory, much like the configuration is passed using the --config
argument. That way there would be no leftovers between different system
generations...
Alternately, /run/NetworkManager/conf.d/*.conf should also be a possibly
better option than /etc/, although you still will have to clean up when
switching generations...
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ95a+QAKCRDcUY/If5cW
qkczAP9PNYbd0G5luIek6kDsAoGG3iOw3+OtyBkqq1DcZMxn7wD9Hs+e2yrBlk8b
XpSnxOgcLMwdYEV1EItols4FM2JwkAI=
=6neh
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Mar 2025 10:30:02 +0000
Resent-Message-ID: <handler.76688.B76688.17426393816449 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 76688 <at> debbugs.gnu.org, Arnaud Daby-Seesaram <ds-ac@HIDDEN>, 45mg <45mg.writes@HIDDEN>
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.17426393816449
(code B ref 76688); Sat, 22 Mar 2025 10:30:02 +0000
Received: (at 76688) by debbugs.gnu.org; 22 Mar 2025 10:29:41 +0000
Received: from localhost ([127.0.0.1]:40973 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tvw6m-0001fw-M8
for submit <at> debbugs.gnu.org; Sat, 22 Mar 2025 06:29:41 -0400
Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:60493)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tvw6j-0001fe-Uw
for 76688 <at> debbugs.gnu.org; Sat, 22 Mar 2025 06:29:38 -0400
Received: by mail-pj1-x1036.google.com with SMTP id
98e67ed59e1d1-2ff694d2d4dso4354556a91.0
for <76688 <at> debbugs.gnu.org>; Sat, 22 Mar 2025 03:29:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742639372; x=1743244172; 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=L2g3ZAbxVwouGRzJ2KUrOpq/BoyupZrj7c9Oae17AJc=;
b=LGyyk5oWLnos1BhAntM3ZjYtvxOxGKPAAabqkjUXvasOQeAXlTgMIOL4h8fcPgQSqf
YpwX70Jj6T6Y4rBri582Ch4U0DpnoJp5tK/l3QforAb9B6vA9+PyhkuGmJO6QCnT6EFu
ig8hwiJWL6aOu5byQ9loL5W7wLVxuxFu+Fv9wkeV9+lBPWMq7sHo1hh4y/5Q+GljZ27Q
VdipFuiQLTAJpPcI5eFzJ0yA1WE6z+U9ukz8LEcaYIUs5zowuTdEgGMrKsciRTcz4WK0
bdKwrWaIewusW85j27nDhBx+p84hCEwdSsGU/LuWFNuoexJRUYBYvzv/tNSyDaTEj15m
7yzQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742639372; x=1743244172;
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=L2g3ZAbxVwouGRzJ2KUrOpq/BoyupZrj7c9Oae17AJc=;
b=IA6b+63pIVnPOHdrTKzPGOFOggdilhDVscUzJZaKYkN5SdcI31PC1ZPxadqANw9CLg
e3pHDiZhTHYsSj7E81YJgKzhVs8AVstUe5qSN4Grr46qLTyJnZF1aXQ3zMEbSLLAd+kQ
t5CAShHUSIbDE2xq1r51S25evSuxAgBAooDaV3PWlcv5FWLb0FW9XPytdgDdLI61gEUx
/nh7y+cbtpq7CW79PUGvFcBjhxGpafKlzHdlV4zaaHqv9R3XoKhYEjKZdYlbIY0onqdk
k+xY6CZd7HzXAKVDadTf/pjzcSI2VQw+Di2DRUk94hY7P3lhFNdtKmm417lg2xnlf42y
bHzA==
X-Forwarded-Encrypted: i=1;
AJvYcCXxoMF0xMebUMAivvtj77SM6gUqJK9P80tlL3LQEbssnYh3Uu7Cgb2S3mNi5Y6bWYz8oy+UoA==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YysH//udhKgIo9ZEN3WHhbrhVw5B2YUltSYjrz63xT8tO8aXd5O
uWmM6ZGMijnPi8xhpEbMAbYAjDWSn6qENul9Ou0R88w5VT8IDT+F
X-Gm-Gg: ASbGncuhZnIaAp8+H3lDX493+tgWuf7glihSNN5RE4lv5HDYzAC6WL2RFSCot3gzSYi
Nw96v2+CjpilCho1rhGQyd1FBdqZYoiCDt/XqMtimu1QliDBpmxtU4CxjikvKn+6jrXfNGaNq5+
jHqkfdpaJWvXpeMs0eHc45Lbdbnf4LkFO3CJurUFtJ46WkL6k4U/rYyvfvz8GUeppevzm9ESVuO
aScPnwrHzUmw+iuFESVK+alZX01qjOhW1sACXBWDC9pc6Lq4cqtqmQx4k8EBdBc90GORwvthaEw
YtFcROC4uR+UoIsZKGeBZL1oIDoNqsgpc0a1QYbPWn8=
X-Google-Smtp-Source: AGHT+IG5UYOa60GUmP4bX/WEBSdPoxxDCMXLDRRjp8JnWJv5VV50Tgtv4sRENXRehJcEmxiFkWAMVg==
X-Received: by 2002:a17:90a:ec8c:b0:2ff:6e72:b8e9 with SMTP id
98e67ed59e1d1-3030fee7104mr11013891a91.25.1742639371445;
Sat, 22 Mar 2025 03:29:31 -0700 (PDT)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-3030f806b48sm3775685a91.44.2025.03.22.03.29.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 22 Mar 2025 03:29:30 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <87jz8hk1s6.fsf@wireframe> (Vagrant Cascadian's message of "Fri,
21 Mar 2025 23:38:49 -0700")
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87jz8hk1s6.fsf@wireframe>
Date: Sat, 22 Mar 2025 19:29:16 +0900
Message-ID: <877c4hjr43.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Vagrant,
Vagrant Cascadian <vagrant@HIDDEN> writes:
[...]
> I hit this bug as well, and it actually caused a boot failure, had to
> boot to an older generation to get things working again!
>
> Have not yet tried the patch, though it looks like it should fix this
> exact problem...
>
> But... I am wondering if it wouldn't be more elegant to avoid using
> /etc/NetworkManager/conf.d entirely, instead call NetworkManager
> pointing the --config-dir arguments directly at the relevent store
> directory, much like the configuration is passed using the --config
> argument. That way there would be no leftovers between different system
> generations...
The thing is that NetworkManager, among other tools, make use of inotify
to monitor configuration changes, which is very useful as it avoids the
user having to restart the daemon or worst, reboot to have the changes
effected post a reconfiguration. On such example was udev; see commit
e9fa17eb98efbd6211ab44ab49b8c078d4b73e04 that changed it from using a
store value for its config file to a /etc/udev/rules.d fixed location.
--
Thanks,
Maxim
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Mar 2025 16:53:01 +0000
Resent-Message-ID: <handler.76688.B76688.174266236823621 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Cc: 76688 <at> debbugs.gnu.org, Arnaud Daby-Seesaram <ds-ac@HIDDEN>, 45mg <45mg.writes@HIDDEN>
Received: via spool by 76688-submit <at> debbugs.gnu.org id=B76688.174266236823621
(code B ref 76688); Sat, 22 Mar 2025 16:53:01 +0000
Received: (at 76688) by debbugs.gnu.org; 22 Mar 2025 16:52:48 +0000
Received: from localhost ([127.0.0.1]:45028 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tw25X-00068v-Pd
for submit <at> debbugs.gnu.org; Sat, 22 Mar 2025 12:52:48 -0400
Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:58158)
by debbugs.gnu.org with esmtps
(TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1tw25W-00068b-39
for 76688 <at> debbugs.gnu.org; Sat, 22 Mar 2025 12:52:46 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1742662358;
bh=cPLC8J1+Xq9SF81owXvuB95NUV7bV4JHSsTPqn6vDmc=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=XGMLXDvxt8WFgkncXPwGRfj0FToqTqxGjipkHZtSI1fbjDCWL8qv6o4lNeBd9Jl0i
k+qRTVc0MwJqB26lZ62omb0arrScpZExAuxafKFd5lEzzKyMm3VinsJT1wAuSLRGNT
vzMYJrRaqQF3OCD3gAe6taO70JPcpyWV/A6wk6CFg1Pe0w52djyix0gnY72CX84z8y
W68lewQaWZhwR1NmbXCQDIVrbgQk1NWq4irU4Nav/ErOmpO3ByTxG7rksiTn/88V08
0HAJNtrlg/U4ML4DBFI0A3TfWlN+icpvrM1l5ZZY+wy2vh3yZK8Y6D9AZtKeBYNSIa
xg9HSI843y2yw==
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
by cascadia.aikidev.net (Postfix) with ESMTPSA id 3B12C6AB8;
Sat, 22 Mar 2025 09:52:38 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <877c4hjr43.fsf@HIDDEN>
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87jz8hk1s6.fsf@wireframe> <877c4hjr43.fsf@HIDDEN>
Date: Sat, 22 Mar 2025 09:52:32 -0700
Message-ID: <87h63lj9db.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
On 2025-03-22, Maxim Cournoyer wrote:
> Vagrant Cascadian <vagrant@HIDDEN> writes:
>> I hit this bug as well, and it actually caused a boot failure, had to
>> boot to an older generation to get things working again!
>>
>> Have not yet tried the patch, though it looks like it should fix this
>> exact problem...
I did get a chance to test the patch, and it worked to allow me to
reconfigure multiple times and still be able to reboot into the new
generation.
Though I did notice that nothing seems to clean up
/etc/NetworkManager/conf.d if you switch to a generation where the
configuration file is not present, so if you want to remove the
configuration you need to do so manually, which seems to break the
delcarative system configuration a bit.
>> But... I am wondering if it wouldn't be more elegant to avoid using
>> /etc/NetworkManager/conf.d entirely, instead call NetworkManager
>> pointing the --config-dir arguments directly at the relevent store
>> directory, much like the configuration is passed using the --config
>> argument. That way there would be no leftovers between different system
>> generations...
>
> The thing is that NetworkManager, among other tools, make use of inotify
> to monitor configuration changes, which is very useful as it avoids the
> user having to restart the daemon or worst, reboot to have the changes
> effected post a reconfiguration. On such example was udev; see commit
> e9fa17eb98efbd6211ab44ab49b8c078d4b73e04 that changed it from using a
> store value for its config file to a /etc/udev/rules.d fixed location.
Fair! Though the conf.d symlink just points to the store (at least in
the configuration I tried) or, or will it notice when the symlink
changes? Are there cases where it would change from a single conf.d
symlink to a conf.d directory with multiple symlinks into the store? (so
far, I only tested with a single configuration file)
Regardless, I still wonder if it might be worth using
/run/NetworkManager/conf.d instead of /etc as this would at least get
automatically cleaned up between reboots.
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ97q0AAKCRDcUY/If5cW
qr1OAQDZqRLg8udUB97ZixgWoIlGJvvANSHSzSJ1jQT8yZsPSgD/YNJHayjEyiq9
NFchaXR0VJyISpD36puJVcVC3OhAtQs=
=N8FN
-----END PGP SIGNATURE-----
--=-=-=--
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Vagrant Cascadian <vagrant@HIDDEN>
Subject: bug#76688: closed ([PATCH] services: network-manager: Handle
existing configuration directory.)
CC: tracker <at> debbugs.gnu.org
Message-ID: <handler.76688.D76688.174275120022189.ackdone <at> debbugs.gnu.org>
References: <87sen3ire6.fsf@wireframe>
<99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
X-Gnu-PR-Message: closed 76688
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Date: Sun, 23 Mar 2025 17:34:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1742751242-22257-0"
This is a multi-part message in MIME format...
------------=_1742751242-22257-0
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf-8
Your message dated Sun, 23 Mar 2025 10:33:05 -0700
with message-id <87sen3ire6.fsf@wireframe>
and subject line Re: [bug#76688] [PATCH] services: network-manager: Handle =
existing configuration directory.
has caused the debbugs.gnu.org bug report #76688,
regarding [PATCH] services: network-manager: Handle existing configuration =
directory.
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs@HIDDEN)
--=20
76688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76688
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems
------------=_1742751242-22257-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 18:32:53 +0000
Received: from localhost ([127.0.0.1]:35045 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1too7Q-0002Wc-TI
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:53 -0500
Received: from lists.gnu.org ([2001:470:142::17]:48314)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <45mg.writes@HIDDEN>)
id 1too7N-0002W3-6e
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:50 -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@HIDDEN>)
id 1too7H-0002UR-Ln
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <45mg.writes@HIDDEN>)
id 1too7G-0002yH-1S
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: by mail-pl1-x643.google.com with SMTP id
d9443c01a7336-223594b3c6dso60893005ad.2
for <guix-patches@HIDDEN>; Sun, 02 Mar 2025 10:32:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740940360; x=1741545160; 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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=KkAKh9/67MnlOyEiJeetC61cyKMiXx7vJVQR51uLfe88QqJLnSkyUpCuFyAsjykeNL
GmhS6lVScEgNYHWRommiMxjrXrHtpQlY14w/4RrILUypSAv4HyshGvVbbu9cCyhUFdeI
XeNCG8iPrcub/fYNZtNeOpiQ9f/FNyE98ieSR5VATJqahtvqqKdM/sjOkLIsSLOiAu+s
sRxykCefaGqnIf/9M3xO0xV97BxvvH5lW6GI0AYc6YZLUG7nsOW/cpKZiucVE7whHxDw
GYuL8AZS7sPxoHicsor6jjhTVaWGnSNnIOyAMccvUkYJdJiG33imYWBiA1eHz/2mRkwk
UOGg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740940360; x=1741545160;
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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=tFTQuGkQipzfw4cdiB6bNY4z3n7TCc8UVy0FIpVd6WEKFzd1Z1B4GHKoUc0paVHqcU
n4ZO8FRMPX1/jmstoD1g2mEnHPGWksJEYGszKCVmY/Wlan9LgShuiC1XW1jFRouK0jtp
aNnp0/yeV7uZl3cpfFh9aFwp1+4lfoDKU/MU4ce9ERZsqrD4i9K4uxpM7A5C7/U+f3YG
rxNbBzBp+Mk7rBg/8zkGNV5EV3F+QTqn9+wq2xUlg5ufTbJlZm4f++vfdSCJd83QIz5I
+/AP+8MvitbGEuOgQjEx1bTOi+fA9slBHiMYYdNIk2mfAy3RAC1YIhVD81MsIBcdY2cG
M7MQ==
X-Gm-Message-State: AOJu0Yz7gm1ceVi5G2MP/Pmnwlrd2fzvwogAEb1DE39XaJGMup1vdB6q
YC/tXNAINAEyRP2CidzzcddKmbi/NIm3SIJVADnrAhOB7bXPvZnb+xHpnm1O
X-Gm-Gg: ASbGncvwthQLxIRxYX5SETZyMgMPhC1ia/D1xA+htG5KJ3NMgzhdg0xzkiXpSTJHo+l
HkNqpPS/7ryfyw5cYLEXbrYFaDC36nVVjxdwxcSXhYwsgSDqHLJkSJZ977psTRwoGpTc+PDBSq5
gFbmiBxgOWFPKC3gNnEo4M8tGND+fA5Qof2SVvkSJv7UKADTKMhRxeQEdqvtGuiot/02MVDx7ir
Qd5qHH1lnHp9qpBPT70JnFhiVAsCGW28fJe0/l2lHw43iJ3wMHckL2CT8aeGuSTUQbTZSkFQcZ1
GaiG/fdY20RdRr42vP1g+n02bKxSTtiJXYJ+EdHOP/kdUyLjD8qpz1/hxkNTlopWpPk=
X-Google-Smtp-Source: AGHT+IHEKy03zaDU6hEWFgvtKqLFawUbhrU+aIGvYLWSv+I8hHr/9u1Hxk2MkdtmZIoUeRBrV5PAfw==
X-Received: by 2002:a17:902:ecc8:b0:21f:61a9:be7d with SMTP id
d9443c01a7336-22369223651mr191769375ad.49.1740940359636;
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-7364ce34233sm1136700b3a.63.2025.03.02.10.32.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
From: 45mg <45mg.writes@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] services: network-manager: Handle existing configuration
directory.
Date: Sun, 2 Mar 2025 23:59:49 +0530
Message-ID: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::643;
envelope-from=45mg.writes@HIDDEN; helo=mail-pl1-x643.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.0 (+)
X-Debbugs-Envelope-To: submit
Cc: 45mg <45mg.writes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/services/networking.scm (network-manager-activation):
Handle the case where /etc/NetworkManager/conf.d already exists.
Change-Id: I7af4f4ad226eef28bd8667f0708525e77a6a50c8
---
Follow-up to 0caba8f5db48c15a2c3edae37e816654246fa986.
This issue only became apparent after pulling the above commit, changing my
system config to use the new extra-files field, and reconfiguring /twice/. This
sort of thing is why I now pull from a local fork and apply patches to it before
submitting them ;)
gnu/services/networking.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 53840c2764..45efea330b 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1271,7 +1271,18 @@ (define (network-manager-activation config)
'((mkdir-p "/var/lib/misc"))
'())
#$@(if (pair? extra-configuration-files) ;if non-empty
- `((symlink
+ ;; If /etc/NetworkManager/conf.d is a symlink to a store file,
+ ;; delete it.
+ `((if (and (file-exists? "/etc/NetworkManager/conf.d")
+ (store-file-name?
+ (canonicalize-path "/etc/NetworkManager/conf.d")))
+ (delete-file-recursively
+ "/etc/NetworkManager/conf.d"))
+ ;; If it exists but is not a symlink to a store file, then
+ ;; this will fail with EEXIST; we leave this for the user to
+ ;; handle, since they probably created the directory
+ ;; themselves.
+ (symlink
,(file-union "network-manager-configuration-directory"
extra-configuration-files)
"/etc/NetworkManager/conf.d"))
base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
--
2.48.1
------------=_1742751242-22257-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Received: (at 76688-done) by debbugs.gnu.org; 23 Mar 2025 17:33:20 +0000
Received: from localhost ([127.0.0.1]:52426 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1twPCK-0005ln-Eb
for submit <at> debbugs.gnu.org; Sun, 23 Mar 2025 13:33:20 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:53352)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <vagrant@HIDDEN>)
id 1twPCH-0005lN-D4
for 76688-done <at> debbugs.gnu.org; Sun, 23 Mar 2025 13:33:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1742751191;
bh=a7U5K2bVS4g/+6J89KrxpZahhKAwA9gHPOHQsKyItZs=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=dC5+/6jEq9XgNqkyiRaQsdbUKLMEL97VhDig0FA5bOcrfzrrf/hPtas8nad1jriYG
msVhGN6zoiF7tBcBaima9ILliS4IsAd5G/Se38iWo30sgfkPOJpvPsgLUez3irh7BE
6OUM4zrUAftTJTJZGsRcUwKOtO/Mvf2vNZ64l185OvpZ0uCFtZWMxCW07X1EGT5diK
Us206vZaQfH3m/JtQkivilUHMF/ixSIb/2lv/HSEeqiZ1J2OMr8nqEdGLB+DyFkCWn
rh0uhIv7HBkofkjEzffdRxd6J7ygBKDteyZ4hXc6zQIzwuPrv9QYPyWBNTqoQn44jv
WWnl7Cc1aWMFA==
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
by cascadia.aikidev.net (Postfix) with ESMTPSA id 822225B4B;
Sun, 23 Mar 2025 10:33:11 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#76688] [PATCH] services: network-manager: Handle existing
configuration directory.
In-Reply-To: <87h63lj9db.fsf@wireframe>
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87jz8hk1s6.fsf@wireframe> <877c4hjr43.fsf@HIDDEN>
<87h63lj9db.fsf@wireframe>
Date: Sun, 23 Mar 2025 10:33:05 -0700
Message-ID: <87sen3ire6.fsf@wireframe>
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: 76688-done
Cc: 76688-done <at> debbugs.gnu.org, Arnaud Daby-Seesaram <ds-ac@HIDDEN>,
45mg <45mg.writes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
On 2025-03-22, Vagrant Cascadian wrote:
> On 2025-03-22, Maxim Cournoyer wrote:
>> Vagrant Cascadian <vagrant@HIDDEN> writes:
>>> I hit this bug as well, and it actually caused a boot failure, had to
>>> boot to an older generation to get things working again!
>>>
>>> Have not yet tried the patch, though it looks like it should fix this
>>> exact problem...
>
> I did get a chance to test the patch, and it worked to allow me to
> reconfigure multiple times and still be able to reboot into the new
> generation.
Given that the patch is a few weeks old, and it is a relatively new
feature, and not having it can trigger a boot failure, I went ahead and
pushed as a1e87abaa364f8391cfd1f49bb01876f7a730bfb services:
network-manager: Handle existing configuration directory.
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ+BF0QAKCRDcUY/If5cW
qlnuAP9nP7IknNQDlKmdkTmua10Yu+APAb5i8rMjAfViFIrweQEA3lnxekUG9eH3
JOrDm8upX4Ffy+5swqoN3uaNy7UTiw8=
=IQ0C
-----END PGP SIGNATURE-----
--=-=-=--
------------=_1742751242-22257-0--
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: 45mg <45mg.writes@HIDDEN>
Subject: bug#76688: closed (Re: [bug#76688] [PATCH] services:
network-manager: Handle existing configuration directory.)
Message-ID: <handler.76688.D76688.174275120022189.notifdone <at> debbugs.gnu.org>
References: <87sen3ire6.fsf@wireframe>
<99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
X-Gnu-PR-Message: they-closed 76688
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 76688 <at> debbugs.gnu.org
Date: Sun, 23 Mar 2025 17:34:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1742751242-22257-1"
This is a multi-part message in MIME format...
------------=_1742751242-22257-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
Your bug report
#76688: [PATCH] services: network-manager: Handle existing configuration di=
rectory.
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 76688 <at> debbugs.gnu.org.
--=20
76688: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76688
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems
------------=_1742751242-22257-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Received: (at 76688-done) by debbugs.gnu.org; 23 Mar 2025 17:33:20 +0000
Received: from localhost ([127.0.0.1]:52426 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1twPCK-0005ln-Eb
for submit <at> debbugs.gnu.org; Sun, 23 Mar 2025 13:33:20 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:53352)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <vagrant@HIDDEN>)
id 1twPCH-0005lN-D4
for 76688-done <at> debbugs.gnu.org; Sun, 23 Mar 2025 13:33:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1742751191;
bh=a7U5K2bVS4g/+6J89KrxpZahhKAwA9gHPOHQsKyItZs=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=dC5+/6jEq9XgNqkyiRaQsdbUKLMEL97VhDig0FA5bOcrfzrrf/hPtas8nad1jriYG
msVhGN6zoiF7tBcBaima9ILliS4IsAd5G/Se38iWo30sgfkPOJpvPsgLUez3irh7BE
6OUM4zrUAftTJTJZGsRcUwKOtO/Mvf2vNZ64l185OvpZ0uCFtZWMxCW07X1EGT5diK
Us206vZaQfH3m/JtQkivilUHMF/ixSIb/2lv/HSEeqiZ1J2OMr8nqEdGLB+DyFkCWn
rh0uhIv7HBkofkjEzffdRxd6J7ygBKDteyZ4hXc6zQIzwuPrv9QYPyWBNTqoQn44jv
WWnl7Cc1aWMFA==
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
by cascadia.aikidev.net (Postfix) with ESMTPSA id 822225B4B;
Sun, 23 Mar 2025 10:33:11 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#76688] [PATCH] services: network-manager: Handle existing
configuration directory.
In-Reply-To: <87h63lj9db.fsf@wireframe>
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87jz8hk1s6.fsf@wireframe> <877c4hjr43.fsf@HIDDEN>
<87h63lj9db.fsf@wireframe>
Date: Sun, 23 Mar 2025 10:33:05 -0700
Message-ID: <87sen3ire6.fsf@wireframe>
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: 76688-done
Cc: 76688-done <at> debbugs.gnu.org, Arnaud Daby-Seesaram <ds-ac@HIDDEN>,
45mg <45mg.writes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
On 2025-03-22, Vagrant Cascadian wrote:
> On 2025-03-22, Maxim Cournoyer wrote:
>> Vagrant Cascadian <vagrant@HIDDEN> writes:
>>> I hit this bug as well, and it actually caused a boot failure, had to
>>> boot to an older generation to get things working again!
>>>
>>> Have not yet tried the patch, though it looks like it should fix this
>>> exact problem...
>
> I did get a chance to test the patch, and it worked to allow me to
> reconfigure multiple times and still be able to reboot into the new
> generation.
Given that the patch is a few weeks old, and it is a relatively new
feature, and not having it can trigger a boot failure, I went ahead and
pushed as a1e87abaa364f8391cfd1f49bb01876f7a730bfb services:
network-manager: Handle existing configuration directory.
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ+BF0QAKCRDcUY/If5cW
qlnuAP9nP7IknNQDlKmdkTmua10Yu+APAb5i8rMjAfViFIrweQEA3lnxekUG9eH3
JOrDm8upX4Ffy+5swqoN3uaNy7UTiw8=
=IQ0C
-----END PGP SIGNATURE-----
--=-=-=--
------------=_1742751242-22257-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 18:32:53 +0000
Received: from localhost ([127.0.0.1]:35045 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1too7Q-0002Wc-TI
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:53 -0500
Received: from lists.gnu.org ([2001:470:142::17]:48314)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <45mg.writes@HIDDEN>)
id 1too7N-0002W3-6e
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:32:50 -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@HIDDEN>)
id 1too7H-0002UR-Ln
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <45mg.writes@HIDDEN>)
id 1too7G-0002yH-1S
for guix-patches@HIDDEN; Sun, 02 Mar 2025 13:32:43 -0500
Received: by mail-pl1-x643.google.com with SMTP id
d9443c01a7336-223594b3c6dso60893005ad.2
for <guix-patches@HIDDEN>; Sun, 02 Mar 2025 10:32:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740940360; x=1741545160; 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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=KkAKh9/67MnlOyEiJeetC61cyKMiXx7vJVQR51uLfe88QqJLnSkyUpCuFyAsjykeNL
GmhS6lVScEgNYHWRommiMxjrXrHtpQlY14w/4RrILUypSAv4HyshGvVbbu9cCyhUFdeI
XeNCG8iPrcub/fYNZtNeOpiQ9f/FNyE98ieSR5VATJqahtvqqKdM/sjOkLIsSLOiAu+s
sRxykCefaGqnIf/9M3xO0xV97BxvvH5lW6GI0AYc6YZLUG7nsOW/cpKZiucVE7whHxDw
GYuL8AZS7sPxoHicsor6jjhTVaWGnSNnIOyAMccvUkYJdJiG33imYWBiA1eHz/2mRkwk
UOGg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740940360; x=1741545160;
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=lbq2d0JnUqg1c1IzKaLrHILRMVkCH3OVzdyAwXDozLY=;
b=tFTQuGkQipzfw4cdiB6bNY4z3n7TCc8UVy0FIpVd6WEKFzd1Z1B4GHKoUc0paVHqcU
n4ZO8FRMPX1/jmstoD1g2mEnHPGWksJEYGszKCVmY/Wlan9LgShuiC1XW1jFRouK0jtp
aNnp0/yeV7uZl3cpfFh9aFwp1+4lfoDKU/MU4ce9ERZsqrD4i9K4uxpM7A5C7/U+f3YG
rxNbBzBp+Mk7rBg/8zkGNV5EV3F+QTqn9+wq2xUlg5ufTbJlZm4f++vfdSCJd83QIz5I
+/AP+8MvitbGEuOgQjEx1bTOi+fA9slBHiMYYdNIk2mfAy3RAC1YIhVD81MsIBcdY2cG
M7MQ==
X-Gm-Message-State: AOJu0Yz7gm1ceVi5G2MP/Pmnwlrd2fzvwogAEb1DE39XaJGMup1vdB6q
YC/tXNAINAEyRP2CidzzcddKmbi/NIm3SIJVADnrAhOB7bXPvZnb+xHpnm1O
X-Gm-Gg: ASbGncvwthQLxIRxYX5SETZyMgMPhC1ia/D1xA+htG5KJ3NMgzhdg0xzkiXpSTJHo+l
HkNqpPS/7ryfyw5cYLEXbrYFaDC36nVVjxdwxcSXhYwsgSDqHLJkSJZ977psTRwoGpTc+PDBSq5
gFbmiBxgOWFPKC3gNnEo4M8tGND+fA5Qof2SVvkSJv7UKADTKMhRxeQEdqvtGuiot/02MVDx7ir
Qd5qHH1lnHp9qpBPT70JnFhiVAsCGW28fJe0/l2lHw43iJ3wMHckL2CT8aeGuSTUQbTZSkFQcZ1
GaiG/fdY20RdRr42vP1g+n02bKxSTtiJXYJ+EdHOP/kdUyLjD8qpz1/hxkNTlopWpPk=
X-Google-Smtp-Source: AGHT+IHEKy03zaDU6hEWFgvtKqLFawUbhrU+aIGvYLWSv+I8hHr/9u1Hxk2MkdtmZIoUeRBrV5PAfw==
X-Received: by 2002:a17:902:ecc8:b0:21f:61a9:be7d with SMTP id
d9443c01a7336-22369223651mr191769375ad.49.1740940359636;
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-7364ce34233sm1136700b3a.63.2025.03.02.10.32.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Mar 2025 10:32:39 -0800 (PST)
From: 45mg <45mg.writes@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] services: network-manager: Handle existing configuration
directory.
Date: Sun, 2 Mar 2025 23:59:49 +0530
Message-ID: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::643;
envelope-from=45mg.writes@HIDDEN; helo=mail-pl1-x643.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.0 (+)
X-Debbugs-Envelope-To: submit
Cc: 45mg <45mg.writes@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/services/networking.scm (network-manager-activation):
Handle the case where /etc/NetworkManager/conf.d already exists.
Change-Id: I7af4f4ad226eef28bd8667f0708525e77a6a50c8
---
Follow-up to 0caba8f5db48c15a2c3edae37e816654246fa986.
This issue only became apparent after pulling the above commit, changing my
system config to use the new extra-files field, and reconfiguring /twice/. This
sort of thing is why I now pull from a local fork and apply patches to it before
submitting them ;)
gnu/services/networking.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 53840c2764..45efea330b 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1271,7 +1271,18 @@ (define (network-manager-activation config)
'((mkdir-p "/var/lib/misc"))
'())
#$@(if (pair? extra-configuration-files) ;if non-empty
- `((symlink
+ ;; If /etc/NetworkManager/conf.d is a symlink to a store file,
+ ;; delete it.
+ `((if (and (file-exists? "/etc/NetworkManager/conf.d")
+ (store-file-name?
+ (canonicalize-path "/etc/NetworkManager/conf.d")))
+ (delete-file-recursively
+ "/etc/NetworkManager/conf.d"))
+ ;; If it exists but is not a symlink to a store file, then
+ ;; this will fail with EEXIST; we leave this for the user to
+ ;; handle, since they probably created the directory
+ ;; themselves.
+ (symlink
,(file-union "network-manager-configuration-directory"
extra-configuration-files)
"/etc/NetworkManager/conf.d"))
base-commit: f9dcb84550b85aa816899b2106b1a5ae546167a3
--
2.48.1
------------=_1742751242-22257-1--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76688] [PATCH] services: network-manager: Handle existing configuration directory.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 24 Mar 2025 00:27:01 +0000
Resent-Message-ID: <handler.76688.D76688.174277597025497 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76688
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 76688-done <at> debbugs.gnu.org, Arnaud Daby-Seesaram <ds-ac@HIDDEN>, 45mg <45mg.writes@HIDDEN>
Received: via spool by 76688-done <at> debbugs.gnu.org id=D76688.174277597025497
(code D ref 76688); Mon, 24 Mar 2025 00:27:01 +0000
Received: (at 76688-done) by debbugs.gnu.org; 24 Mar 2025 00:26:10 +0000
Received: from localhost ([127.0.0.1]:53155 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1twVdp-0006dB-Rt
for submit <at> debbugs.gnu.org; Sun, 23 Mar 2025 20:26:10 -0400
Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:43209)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1twVdn-0006cZ-AJ
for 76688-done <at> debbugs.gnu.org; Sun, 23 Mar 2025 20:26:07 -0400
Received: by mail-pl1-x631.google.com with SMTP id
d9443c01a7336-225df540edcso91633475ad.0
for <76688-done <at> debbugs.gnu.org>; Sun, 23 Mar 2025 17:26:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742775961; x=1743380761; 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=Xnb0i0eBTjEIimMGMOaEAgfxpcEM+SZ+8Lan2nHhEDA=;
b=hocbvp0QYola5G4Bv+6o5BtyxiWQLHJPv6P4WTsDyM9ldRgEFVABuFrUyjxZBMrYJF
7azQBvABb4UZqjPBlrJM7aiudACIGqMbbNXcrW/vv6AKChvPnHUKMpbj0h+c0JqvNOzx
mBPz1w+GQm5CFLbUD50kllydyPPbFgGRaA3Pi+2xIzWd+xbLLYQOFt692VpK9nblymmL
Wt7wztTEms+7BRoqDd6WXoqEAF+hpStwmvuaydV3Q09eJs6cxVOulXkvwYb6FtS4+AtO
G6eRIR69KTwS1HYG5HKCPJG6EEZuiR1gzGkzFI0gFnN8DGXZTsmxFmhyB4iwqgbkKTwx
DTVw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742775961; x=1743380761;
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=Xnb0i0eBTjEIimMGMOaEAgfxpcEM+SZ+8Lan2nHhEDA=;
b=gqLMlypks3ZcHRGm8GbxP6T64rfkgLwk9y0IA2gi4L1YMEepz/XUlyvKIgxtnog3vt
N28N5kXV5Svz87wQOKv4QWXrOvhdu+4AnofI0osIUjc+rSd13drrA39TxT/Lji9mGG+m
nP2zgsLIbAKlQ1C218IQXjwA9VSdyQP3TGlcH9/nTd1W/RZ/KIJVoxD69uyd6fj+Ku4N
fjwioMfwWdsqJicMguaIPmkArFg8q1PuLAtQrWO9TeBdkvXa3XXuaHT95laYZtPOHu9E
aFWMEo81HVz7t8yKtX9OhQEBQnw7FuV539bSs2zXnCJNj/dMGPyu+7VyHpyFGPpt88m8
/EOw==
X-Forwarded-Encrypted: i=1;
AJvYcCUD+MFlEf6WigX74a9kDW3q4uZSgfHdI+BDP1Aw+9AZiXoSUR/EDfM+B6u5Ut/EffmszGyvoYWnESqD <at> debbugs.gnu.org
X-Gm-Message-State: AOJu0YzIM/0Da9Zq3ARKgBUoOvZHiusjiR41cvqEqEVJ7uVqOpLQBKAS
Uj/e/zsPI/NL28uT0uq3EyOg4+3QJbBljPxzsrN7Pisk3LjLZ3J9
X-Gm-Gg: ASbGncvkBLXnohjnTQS+gI1bRUuoPzgqVLS2CqOsSUCg5oCb4Iq1w0wYRu3uPl8uG8y
80fKUR36ziuxyg8ZZZavf3opmdckMPdbD9NX/WXY5b7JghEaikrlyfFqj4l/DMrYHZr+FVVUUIL
pYzOJTky53G7WPkW7Hc/7vdfu2FY0Z5wnD/A/K4YI9ncRyB1g6Cehqz116Igc2Czglb2p4QBO/d
ndZ/GtPRXAMRgWZOjBrKbYBcHvrdmyIsl4iLxpK5xyDmBDiflS5sQxjoNxd+Z9efef8u1wF/7si
kp9hbcx9yWIo4MRdbmqEWArsYyZxijC+40Zt/yW02i8=
X-Google-Smtp-Source: AGHT+IH6vKq6FBDiV+MPLbTCezHMMJyK4iqnGcbFI/6HpPXPvOX5vKe7jhORzV2zFOJuau4KfPfTEg==
X-Received: by 2002:a05:6a00:7698:b0:725:4a1b:38ec with SMTP id
d2e1a72fcca58-7377a08c538mr21849365b3a.3.1742775961047;
Sun, 23 Mar 2025 17:26:01 -0700 (PDT)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-73906008299sm6455272b3a.74.2025.03.23.17.25.59
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 23 Mar 2025 17:26:00 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <87sen3ire6.fsf@wireframe> (Vagrant Cascadian's message of "Sun,
23 Mar 2025 10:33:05 -0700")
References: <99ca7989b63452647788cc77325b7654ae24c244.1740940189.git.45mg.writes@HIDDEN>
<87jz8hk1s6.fsf@wireframe> <877c4hjr43.fsf@HIDDEN>
<87h63lj9db.fsf@wireframe> <87sen3ire6.fsf@wireframe>
Date: Mon, 24 Mar 2025 09:25:44 +0900
Message-ID: <87pli7z33r.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Vagrant,
Vagrant Cascadian <vagrant@HIDDEN> writes:
> On 2025-03-22, Vagrant Cascadian wrote:
>> On 2025-03-22, Maxim Cournoyer wrote:
>>> Vagrant Cascadian <vagrant@HIDDEN> writes:
>>>> I hit this bug as well, and it actually caused a boot failure, had to
>>>> boot to an older generation to get things working again!
>>>>
>>>> Have not yet tried the patch, though it looks like it should fix this
>>>> exact problem...
>>
>> I did get a chance to test the patch, and it worked to allow me to
>> reconfigure multiple times and still be able to reboot into the new
>> generation.
>
> Given that the patch is a few weeks old, and it is a relatively new
> feature, and not having it can trigger a boot failure, I went ahead and
> pushed as a1e87abaa364f8391cfd1f49bb01876f7a730bfb services:
> network-manager: Handle existing configuration directory.
Thank you!
--
Maxim
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.