diff options
| author | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
| commit | 388bd35dd0df2d231bc2cce3746d7d5fd15df23a (patch) | |
| tree | 82e7cc45b8279f83439214c7c79dc7161ffda94d /gnu/system.scm | |
| parent | f1c7c2f697877fcb68b53ea062ff8a88f274a2fe (diff) | |
| parent | d00380b0077b0df2a0b790bb115d07c1533b8863 (diff) | |
| download | guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar.gz | |
Merge branch 'master' into staging-next
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index c284a18379..5bf2a85272 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jannek@gnu.org> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -858,8 +859,8 @@ syntactically correct." (copy-file #$file #$output))))) (define* (operating-system-etc-service os) - "Return a <service> that builds containing the static part of the /etc -directory." + "Return a <service> that builds a directory containing the static part of +the /etc directory." (let* ((login.defs (plain-file "login.defs" (string-append @@ -1134,10 +1135,11 @@ we're running in the final root." (define (operating-system-shepherd-service-names os) "Return the list of Shepherd service names for OS." (append-map shepherd-service-provision - (service-value - (fold-services (operating-system-services os) - #:target-type - shepherd-root-service-type)))) + (shepherd-configuration-services + (service-value + (fold-services (operating-system-services os) + #:target-type + shepherd-root-service-type))))) (define* (operating-system-derivation os) "Return a derivation that builds OS." |