all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time
@ 2024-01-05  8:56 Vivien Kraus via Guix-patches via
  2024-01-07 17:39 ` bug#68259: " Liliana Marie Prikler
  0 siblings, 1 reply; 2+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2024-01-05  8:56 UTC (permalink / raw)
  To: 68259; +Cc: liliana.prikler, maxim.cournoyer, rg

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




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#68259: [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time
  2024-01-05  8:56 [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time Vivien Kraus via Guix-patches via
@ 2024-01-07 17:39 ` Liliana Marie Prikler
  0 siblings, 0 replies; 2+ messages in thread
From: Liliana Marie Prikler @ 2024-01-07 17:39 UTC (permalink / raw)
  To: Vivien Kraus, 68259-done; +Cc: rg, maxim.cournoyer

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




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-01-07 17:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-05  8:56 [bug#68259] [PATCH gnome-team] gnu: dbus-service: only symlink /run/dbus the first time Vivien Kraus via Guix-patches via
2024-01-07 17:39 ` bug#68259: " Liliana Marie Prikler

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.