GNU bug report logs - #76688
[PATCH] services: network-manager: Handle existing configuration directory.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 18:32:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 02 13:32:53 2025
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