From ecb0df6817eb3767e6b4dcf1945f3c2dfbe3b44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 3 May 2019 13:44:15 +0200
Subject: 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.
---
 gnu/installer/services.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu')

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?
-- 
cgit v1.2.3