me/guix
Archived
1
0
Fork 0
Code Activity

services: guix-publish: Use ‘make-systemd-constructor’ unconditionally.

Browse source 
The #:lazy-start? parameter was added in the Shepherd 0.10.0, which is
required since commit 477d4f7d24.

* gnu/services/base.scm (guix-publish-shepherd-service): Use
‘make-systemd-constructor’ unconditionally and pass #:lazy-start?.

Change-Id: I95aa079732cd21e32091c7deea2ed2f1bc50f2f2
This commit is contained in:
Ludovic Courtès 2024-03-21 16:24:29 +01:00
parent d282a31f52
commit a2077e5bee
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/services/base.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
@ -2174,15 +2174,10 @@ raise a deprecation warning if the 'compression-level' field was used."
;; Use lazy socket activation unless ADVERTISE? is true: in that ;; Use lazy socket activation unless ADVERTISE? is true: in that
;; case the process should start right away to advertise itself. ;; case the process should start right away to advertise itself.
(start #~(if (and (defined? 'make-systemd-constructor) ;> 0.9.0? (start #~(make-systemd-constructor
#$(not advertise?)) #$command #$endpoints #$@options
(make-systemd-constructor #:lazy-start? #$(not advertise?)))
#$command #$endpoints #$@options) (stop #~(make-systemd-destructor)))))))
(make-forkexec-constructor #$command #$@options)))
(stop #~(if (and (defined? 'make-systemd-destructor)
#$(not advertise?))
(make-systemd-destructor)
(make-kill-destructor))))))))
(define %guix-publish-accounts (define %guix-publish-accounts
(list (user-group (name "guix-publish") (system? #t)) (list (user-group (name "guix-publish") (system? #t))