From 4c0cc7bed3de2c0e2d3a6e95b88693941e839eec Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato <dnbarbato@posteo.de>
Date: Tue, 28 Apr 2020 13:31:54 +0200
Subject: services: syslog: Simplify 'start' method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a followup to d7113bb655ff80a868a9e624c913f9d23e6c63ad and
e3358a831e7d5d9e8dc614340e49ea5aeb11a7ff.

* gnu/services/base.scm (syslog-service-type): Change 'start' method to set
  umask using the #:file-creation-mask parameter of
  'make-forkexec-constructor' introduced in version 0.8.0 of the Shepherd.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/services/base.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'gnu')

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 2913478e4a..0f119cc2f9 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1316,17 +1316,13 @@ Service Switch}, for an example."
       (documentation "Run the syslog daemon (syslogd).")
       (provision '(syslogd))
       (requirement '(user-processes))
-      (start #~(let ((spawn (make-forkexec-constructor
-                             (list #$(syslog-configuration-syslogd config)
-                                   "--rcfile"
-                                   #$(syslog-configuration-config-file config))
-                             #:pid-file "/var/run/syslog.pid")))
-                 (lambda ()
-                   ;; Set the umask such that file permissions are #o640.
-                   (let ((mask (umask #o137))
-                         (pid  (spawn)))
-                     (umask mask)
-                     pid))))
+      (start #~(make-forkexec-constructor
+                (list #$(syslog-configuration-syslogd config)
+                      "--rcfile"
+                      #$(syslog-configuration-config-file config))
+                ;; Set the umask such that file permissions are #o640.
+                #:file-creation-mask #o137
+                #:pid-file "/var/run/syslog.pid"))
       (stop #~(make-kill-destructor))))))
 
 ;; Snippet adapted from the GNU inetutils manual.
-- 
cgit v1.2.3

div class='path'>path: <a href='/guix/log/?id=7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5'>root</a>/<a href='/guix/log/gnu?id=7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5'>gnu</a>/<a href='/guix/log/gnu/packages?id=7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5'>packages</a>/<a href='/guix/log/gnu/packages/kde-internet.scm?id=7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5'>kde-internet.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/kde-internet.scm?id=7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-02-19 01:00:01 +0100'>2023-02-19</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=1e6ddceb8318d413745ca1c9d91fde01b1e0364b'>gnu: Use HTTPS package home pages wherever possible.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-11-27 21:19:51 +0100'>2022-11-27</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=423dfac29072357c84634647cf8b91e0cc51e239'>gnu: ktorrent: Build with QtWebEngine.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-09-01 17:24:01 +0200'>2022-09-01</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=96405451edf49dd1c7696166571d621e4c43b773'>gnu: KDE Internet: Update to 22.04.3.</a><span class='msg-avail'>...</span></td><td>Petr Hodina</td></tr>
<tr><td><span title='2022-09-01 17:24:00 +0200'>2022-09-01</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=bbd7e74ee875c13796ec6493b5c49ee83158011d'>gnu: KDE: Use breeze-icons over oxygen-icons.</a><span class='msg-avail'>...</span></td><td>Brendan Tildesley</td></tr>
<tr><td><span title='2022-09-01 17:24:00 +0200'>2022-09-01</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=e0f9b9438f5557967f9a429f72ecdb0ebcfb89ad'>gnu: KDE Internet: Update home-page links.</a><span class='msg-avail'>...</span></td><td>Petr Hodina</td></tr>
<tr><td><span title='2022-09-01 17:24:00 +0200'>2022-09-01</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=56d0494512518c1de066c35510aac5d049d35bdc'>gnu: KDE Internet: Update all packages to 21.12.3.</a><span class='msg-avail'>...</span></td><td>Brendan Tildesley</td></tr>
<tr><td><span title='2022-09-01 16:08:15 +0200'>2022-09-01</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=0d3d6fd71b94268ca7a5add1f39205be73586e15'>gnu: libgravatar: Move to (gnu packages kde-pim).</a><span class='msg-avail'>...</span></td><td>Brendan Tildesley</td></tr>
<tr><td><span title='2022-07-31 21:55:48 -0400'>2022-07-31</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=2e27ccec8307961feabbb85589ace67431672c70'>gnu: qtnetworkauth: Rename to qtnetworkauth-5.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-01-29 18:16:48 -0500'>2022-01-29</span></td><td><a href='/guix/commit/gnu/packages/kde-internet.scm?id=f928b56d132e426e5a04db6aa3653debbf0938db'>gnu: choqok: Don't depend on QtWebKit.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>