diff mbox series

[bug#68259,gnome-team] gnu: dbus-service: only symlink /run/dbus the first time

Message ID ca5302001b635655827dde819a962cbaf124cdfa.camel@planete-kraus.eu
State New
Headers show
Series [bug#68259,gnome-team] gnu: dbus-service: only symlink /run/dbus the first time | expand

Commit Message

Vivien Kraus Jan. 5, 2024, 8:56 a.m. UTC 
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

Comments

Liliana Marie Prikler Jan. 7, 2024, 5:39 p.m. UTC | #1 
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
diff mbox series

Patch

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