me
/
guix
Archived
1
0
Fork 0
Code

services: dbus: Simplify 'dbus-uuidgen' invocation. 

* gnu/services/dbus.scm (dbus-activation): Use the "--ensure" option of
'dbus-uuidgen' instead of forking and redirecting ports.
master
Ludovic Courtès 2019-11-13 22:30:49 +01:00
parent 7462a1de22
commit 1f8ca28b9e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/services/dbus.scm
View File

@ -176,18 +176,9 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in
(unless (file-exists? "/etc/machine-id")
(format #t "creating /etc/machine-id...~%")
(let ((prog (string-append #$(dbus-configuration-dbus config)
"/bin/dbus-uuidgen")))
;; XXX: We can't use 'system' because the initrd's
;; guile system(3) only works when 'sh' is in $PATH.
(let ((pid (primitive-fork)))
(if (zero? pid)
(call-with-output-file "/etc/machine-id"
(lambda (port)
(close-fdes 1)
(dup2 (port->fdes port) 1)
(execl prog)))
(waitpid pid)))))))
(invoke (string-append #$(dbus-configuration-dbus config)
"/bin/dbus-uuidgen")
"--ensure=/etc/machine-id"))))
(define dbus-shepherd-service
(match-lambda