diff options
author | Mark H Weaver <mhw@netris.org> | 2018-01-23 17:01:07 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-01-23 17:01:07 -0500 |
commit | a102d359a68ce7219a1880e47dd6f9332cbbce3a (patch) | |
tree | d879e718f08d776ad84c456c91a349e59941d1f2 /gnu/system.scm | |
parent | 07b8ea841e1e2eda5b367f35cf68d23d0520cc4d (diff) | |
parent | f3a13a21e50fa3751fc39e5768ea6843bfc19df2 (diff) | |
download | guix-a102d359a68ce7219a1880e47dd6f9332cbbce3a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 680a2f64f5..71beee8259 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 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 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> @@ -492,8 +492,9 @@ a container or that of a \"bare metal\" system." (define* (operating-system-services os #:key container?) "Return all the services of OS, including \"internal\" services that do not explicitly appear in OS." - (append (operating-system-user-services os) - (essential-services os #:container? container?))) + (instantiate-missing-services + (append (operating-system-user-services os) + (essential-services os #:container? container?)))) ;;; |