summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-03 13:44:15 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-03 13:50:49 +0200
commitecb0df6817eb3767e6b4dcf1945f3c2dfbe3b44f (patch)
tree24de3848d555cbc44f7f39b8b4db8e6fab5466f4
parent3e85909044d8d9b492bcd2ecedde26d71794f145 (diff)
downloadguix-ecb0df6817eb3767e6b4dcf1945f3c2dfbe3b44f.tar.gz
installer: Ensure 'packages' field is a superset of '%base-packages'.
Fixes <https://bugs.gnu.org/35541>.
Reported by Florian Pelz <pelzflorian@pelzflorian.de>.

* gnu/installer/services.scm (system-services->configuration): Generate
a snippet that appends PACKAGES to %BASE-PACKAGES.
-rw-r--r--gnu/installer/services.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index fbfcdac4e5..d1dc516568 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -130,11 +130,13 @@
     (if (null? snippets)
         `(,@(if (null? packages)
                 '()
-                `((packages (list ,@packages))))
+                `((packages (append (list ,@packages)
+                                    %base-packages))))
           (services ,base))
         `(,@(if (null? packages)
                 '()
-                `((packages (list ,@packages))))
+                `((packages (append (list ,@packages)
+                                    %base-packages))))
           (services (append (list ,@snippets
 
                                   ,@(if desktop?