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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68259 in the body.
You can then email your comments to 68259 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Subject: [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

Message #10 received at 68259-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Vivien Kraus <vivien <at> planete-kraus.eu>, 68259-done <at> debbugs.gnu.org
Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink
 /run/dbus the first time
Date: Sun, 07 Jan 2024 18:39:07 +0100

Am Freitag, dem 05.01.2024 um 09:56 +0100 schrieb Vivien Kraus:
> 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.
> ---
Yeah, that LGTM.

Pushed

Previous Next

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