From 53a1cebc9bf6a0f5f8d8b3de84130c772b270082 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
Date: Tue, 28 Sep 2021 10:18:40 +0000
Subject: system: Add guix-icons to the base packages.

* gnu/system.scm (%base-packages-artwork): New variable.
(%base-packages): Add it.
---
 gnu/system.scm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gnu/system.scm')

diff --git a/gnu/system.scm b/gnu/system.scm
index 2b919d8b4a3..69f2ae57868 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -170,6 +170,7 @@
             %setuid-programs
             %sudoers-specification
             %base-packages
+            %base-packages-artwork
             %base-packages-interactive
             %base-packages-linux
             %base-packages-networking
@@ -755,6 +756,10 @@ of PROVENANCE-SERVICE-TYPE to its services."
   (list ath9k-htc-firmware
         openfwwf-firmware))
 
+(define %base-packages-artwork
+  ;; Default set of artwork packages.
+  (list guix-icons))
+
 (define %base-packages-utils
   ;; Default set of  utilities packages.
  (cons* procps psmisc which
@@ -815,6 +820,7 @@ of PROVENANCE-SERVICE-TYPE to its services."
   ;; Default set of packages globally visible.  It should include anything
   ;; required for basic administrator tasks.
   (append (list e2fsprogs)
+          %base-packages-artwork
           %base-packages-interactive
           %base-packages-linux
           %base-packages-networking
-- 
cgit v1.3


From 245602604455ad9f48571af1fc9ecd6493f6e290 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
Date: Tue, 28 Sep 2021 10:19:26 +0000
Subject: system: Introduce the os-release file.

* gnu/system.scm (os-release): New procedure.
(operating-system-etc-service): Use it.
---
 gnu/system.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'gnu/system.scm')

diff --git a/gnu/system.scm b/gnu/system.scm
index 69f2ae57868..80faaf9db89 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -852,6 +852,19 @@ syntactically correct."
                                "--check" "--file" #$file)
                        (copy-file #$file #$output)))))
 
+(define (os-release)
+  (plain-file "os-release"
+              "\
+NAME=\"Guix System\"
+ID=guix
+PRETTY_NAME=\"Guix System\"
+LOGO=guix-icon
+HOME_URL=\"https://guix.gnu.org\"
+DOCUMENTATION_URL=\"https://guix.gnu.org/en/manual\"
+SUPPORT_URL=\"https://guix.gnu.org/en/help\"
+BUG_REPORT_URL=\"https://lists.gnu.org/mailman/listinfo/bug-guix\"
+"))
+
 (define* (operating-system-etc-service os)
   "Return a <service> that builds a directory containing the static part of
 the /etc directory."
@@ -957,7 +970,8 @@ then
   source /run/current-system/profile/etc/profile.d/bash_completion.sh
 fi\n")))
     (etc-service
-     `(("services" ,(file-append net-base "/etc/services"))
+     `(("os-release" ,#~#$(os-release))
+       ("services" ,(file-append net-base "/etc/services"))
        ("protocols" ,(file-append net-base "/etc/protocols"))
        ("rpc" ,(file-append net-base "/etc/rpc"))
        ("login.defs" ,#~#$login.defs)
-- 
cgit v1.3


From 24ead149dbadbaad56f22a89b394bc6fcdc73b52 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 8 Dec 2021 15:27:06 +0100
Subject: system: Mark 'services' field as thunked.

This allows us to make services dependent on (%current-system), for
example.

* gnu/system.scm (<operating-system>)[services]: Mark as thunked.
---
 gnu/system.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/system.scm')

diff --git a/gnu/system.scm b/gnu/system.scm
index 79c3c8130cf..088c62dddea 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -267,6 +267,7 @@
                       (default (operating-system-default-essential-services
                                 this-operating-system)))
   (services operating-system-user-services        ; list of services
+            (thunked)                     ;allow for system-dependent services
             (default %base-services))
 
   (pam-services operating-system-pam-services     ; list of PAM services
-- 
cgit v1.3