ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "services: syslog: Simplify 'start' method."

Browse source 
This reverts commit 4c0cc7bed3.
Fixes <https://bugs.gnu.org/41116>.
Reported by Alex Sassmannshausen <alex@komputilo.eu>.

The problem is that reconfiguring on a system running Shepherd < 0.8.0
would lead to an error, due to #:file-creation-mask not being supported.
The error is rather harmless: it prevents service upgrade but the system
itself is upgraded.

We can reinstate that commit eventually, once #:file-creation-mask has
become widespread.
This commit is contained in:
Ludovic Courtès 2020-05-07 12:45:43 +02:00
parent d6c43d7bc1
commit 5aa4d2dcf2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/services/base.scm
View file

@ -1316,13 +1316,17 @@ (define syslog-service-type
(documentation "Run the syslog daemon (syslogd).") (documentation "Run the syslog daemon (syslogd).")
(provision '(syslogd)) (provision '(syslogd))
(requirement '(user-processes)) (requirement '(user-processes))
(start #~(make-forkexec-constructor (start #~(let ((spawn (make-forkexec-constructor
(list #$(syslog-configuration-syslogd config) (list #$(syslog-configuration-syslogd config)
"--rcfile" "--rcfile"
#$(syslog-configuration-config-file config)) #$(syslog-configuration-config-file config))
;; Set the umask such that file permissions are #o640. #:pid-file "/var/run/syslog.pid")))
#:file-creation-mask #o137 (lambda ()
#:pid-file "/var/run/syslog.pid")) ;; Set the umask such that file permissions are #o640.
(let ((mask (umask #o137))
(pid (spawn)))
(umask mask)
pid))))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
;; Snippet adapted from the GNU inetutils manual. ;; Snippet adapted from the GNU inetutils manual.