GNU bug report logs - #68259
[PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time

Previous Next

Package: guix-patches;

Reported by: Vivien Kraus <vivien <at> planete-kraus.eu>

Date: Fri, 5 Jan 2024 11:35:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: 68259 <at> debbugs.gnu.org
Cc: liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name
Subject: [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time
Date: Fri, 5 Jan 2024 09:56:46 +0100
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(-)

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~%"

base-commit: 1cd97066c2dc84c6e538cfa63820e18f6c12a414
-- 
2.41.0




This bug report was last modified 1 year and 214 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.