janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 72adef8217f81776790b09e6a7feb2a80bd6620d
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Wed May 6 10:07:08 2020 +0200
DRAFT: system: hurd: Populate services.
* gnu/system.scm (hurd-default-essential-services): ...
* gnu/system/hurd.scm (%base-services/hurd): ...
---
gnu/system.scm | 26 +++++++++++++++++++++-----
gnu/system/hurd.scm | 9 ++++++++-
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 0e45c16..b873c91 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages hurd)
#:use-module (gnu packages linux)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages package-management)
@@ -581,11 +582,26 @@ bookkeeping."
(operating-system-firmware os)))))))
(define (hurd-default-essential-services os)
- (list (service system-service-type '())
- %boot-service
- %activation-service
- (hurd-etc-service os)
- (service profile-service-type '())))
+ (let ((entries '() ;;(hurd-operating-system-directory-base-entries os)
+ ))
+ (list (service system-service-type entries)
+ %boot-service
+ %activation-service
+ %shepherd-root-service
+ %hurd-bare-metal-service
+ (service user-processes-service-type)
+ (account-service (append (operating-system-accounts os)
+ (operating-system-groups os))
+ (operating-system-skeletons os))
+ (root-file-system-service)
+ (service file-system-service-type '())
+ (service fstab-service-type
+ (filter file-system-needed-for-boot?
+ (operating-system-file-systems 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."
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 1cc0af1..35d8918 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -69,7 +69,14 @@
net-base inetutils less shepherd which))
(define %base-services/hurd
- '())
+ (list (service hurd-console-service-type
+ (hurd-console-configuration (hurd hurd)))
+ (service hurd-getty-service-type (hurd-getty-configuration
+ (tty "tty1")))
+ (service hurd-getty-service-type (hurd-getty-configuration
+ (tty "tty2")))
+ (service hurd-loopback-service-type)
+ (syslog-service)))
(define* (hurd-grub-configuration-file config entries
#:key
