36/42: services: hurd: Move hurd-default-essential-services.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 433876b2ea7561a0ac09c18e4f2c5a3d41e36171
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 25 12:02:01 2020 +0200

    services: hurd: Move hurd-default-essential-services.
    
    * gnu/system/hurd.scm: Move hurd-essential-services
    (hurd-essential-services): from here ...
    (operating-system-accounts): , updating user,
    * gnu/system.scm (hurd-default-essential-services): to here.
---
 gnu/system.scm      | 19 ++++++++++++++++++-
 gnu/system/hurd.scm | 16 +---------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 5491a68..bee3d4e 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pciutils)
@@ -51,8 +52,9 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages firmware)
   #:use-module (gnu services)
-  #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
+  #:use-module (gnu services hurd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu bootloader)
   #:use-module (gnu system shadow)
   #:use-module (gnu system nss)
@@ -124,6 +126,8 @@
             operating-system-with-gc-roots
             operating-system-with-provenance
 
+            hurd-default-essential-services
+
             boot-parameters
             boot-parameters?
             boot-parameters-label
@@ -560,6 +564,19 @@ bookkeeping."
                          (service firmware-service-type
                                   (operating-system-firmware os)))))))
 
+(define (hurd-default-essential-services os)
+  (list (service system-service-type '())
+        %boot-service
+        %shepherd-root-service
+        %activation-service
+        (account-service (append (operating-system-accounts os)
+                                 (operating-system-groups os))
+                         (operating-system-skeletons os))
+        (pam-root-service (operating-system-pam-services os))
+        (hurd-etc-service os)
+        (service profile-service-type
+                 (operating-system-packages os))))
+
 (define* (operating-system-services os)
   "Return all the services of OS, including \"essential\" services."
   (instantiate-missing-services
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 4873b8c..171e05c 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -107,7 +107,7 @@
     (swap-devices '())
     (timezone "GNUrope")
     (name-service-switch #f)
-    (essential-services (hurd-essential-services this-operating-system))
+    (essential-services (hurd-default-essential-services 
this-operating-system))
     (services (cons (service openssh-service-type
                              (openssh-configuration
                               (use-pam? #f)
@@ -145,20 +145,6 @@
 (define operating-system-etc-directory
   (@@ (gnu system) operating-system-etc-directory))
 
-(define (hurd-essential-services os)
-  (list (service system-service-type '() ;;entries
-                 )
-        %boot-service
-        %shepherd-root-service
-        %activation-service
-        (account-service (append (operating-system-accounts os)
-                                 (operating-system-groups os))
-                         (operating-system-skeletons os))
-        (pam-root-service (operating-system-pam-services os))
-        (hurd-etc-service os)
-        (service profile-service-type
-                 (operating-system-packages os))))
-
 (define (hurd-shepherd-services os)
   (append-map hurd-service->shepherd-service (operating-system-services os)))