From patchwork Fri Jan 5 08:56:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 58372 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E8D1827BBE2; Fri, 5 Jan 2024 11:35:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 82BA527BBE9 for ; Fri, 5 Jan 2024 11:35:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLiTl-00053s-S3; Fri, 05 Jan 2024 06:35:09 -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 ) id 1rLiTc-00053Z-Ob for guix-patches@gnu.org; Fri, 05 Jan 2024 06:35:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLiTc-0004N9-G1 for guix-patches@gnu.org; Fri, 05 Jan 2024 06:35:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLiTe-0002gN-LZ; Fri, 05 Jan 2024 06:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68259@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by submit@debbugs.gnu.org id=B.170445447210263 (code B ref -1); Fri, 05 Jan 2024 11:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2024 11:34:32 +0000 Received: from localhost ([127.0.0.1]:56538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLiTA-0002fT-DP for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:34:32 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLiT6-0002fC-PZ for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:34:31 -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 ) id 1rLiSw-0004yo-Aj for guix-patches@gnu.org; Fri, 05 Jan 2024 06:34:18 -0500 Received: from [2a01:cb18:1080:a00:9d0a:d894:ce16:c7ad] (helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rLiSu-0004Kx-MN for guix-patches@gnu.org; Fri, 05 Jan 2024 06:34:18 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ac197531 for ; Fri, 5 Jan 2024 11:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:to:subject:message-id:mime-version; s=albinoniA; bh=c5Mrh+ 5slQh/2jACeQAH/tDzIL4=; b=CUmDiRk0+it2jIwz6rA6FdD+X/Sj0tlCV0DLcA N48SJRGO3TCUPiBYdlN69Lb3pIytHf4Zpox8kQnauVIoyDHagK58KC5J4MUN86FR G/VyPNHfXO7ur0dbNY6Y08P/2gG8YQA5dsK0ozXDFFJLXJelOVCZhhWbT9XByv+L Kyi77bxNZz8GVECth3XhVWYs7FYhuEzSUoQi9PyY0b/QnaIinT7OmcyvGKlJ/tH3 gOzuUV0e8Kvp2s3nVNuZg3E3Tkf++38av6l8dm8pIxStmJdz/BakqhqnjlT3ije6 FCEJ2+DZJYRtJwTyztqzy4DBr3Ym/4NtEwOHl0q+lByIrIbw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c57cfbe1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Fri, 5 Jan 2024 11:27:29 +0000 (UTC) Date: Fri, 5 Jan 2024 09:56:46 +0100 Message-ID: MIME-Version: 1.0 User-Agent: Evolution 3.48.4 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:cb18:1080:a00:9d0a:d894:ce16:c7ad (failed) Received-SPF: pass client-ip=2a01:cb18:1080:a00:9d0a:d894:ce16:c7ad; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Due to an error in the nesting of S-Expressions, the re-linking of /var/run/dbus to /run/dbus would occur even if it was already a correct symlink. It should only happen if the symlink is different. * gnu/services/dbus.scm (dbus-activation): Adjust accordingly. --- gnu/services/dbus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 1cd97066c2dc84c6e538cfa63820e18f6c12a414 diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 1edcc6eb9e..8dee91a3f7 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -210,9 +210,9 @@ (define (dbus-activation config) (begin (rename-file (string-append "/var/run/dbus/" next) (string-append "/run/dbus/" next)) - (loop (readdir dir)))))))) - (rmdir "/var/run/dbus") - (symlink "/run/dbus" "/var/run/dbus"))) + (loop (readdir dir))))))) + (rmdir "/var/run/dbus") + (symlink "/run/dbus" "/var/run/dbus")))) (else (format (current-error-port) "Failed to symlink /run/dbus to /var/run/dbus: ~s~%"