janneke pushed a commit to branch wip-hurd-vm in repository guix. commit c56a8f64dfc73be2f8a15f197c24a9ef21fad315 Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org> AuthorDate: Sat Apr 25 23:38:48 2020 +0200
HACK switch build -f / guix system --- gnu/system.scm | 7 +++++-- gnu/system/hurd.scm | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index b3bcf89..be49f25 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -575,7 +575,10 @@ bookkeeping." (operating-system-firmware os))))))) (define (hurd-default-essential-services os) - (let ((entries (warn 'hurd-entries (hurd-operating-system-directory-base-entries os)))) + ;; XXX + (let ((entries (if (member "system" (command-line)) + (hurd-operating-system-directory-base-entries os) + '()))) (list (service system-service-type entries) %boot-service %shepherd-root-service @@ -584,7 +587,7 @@ bookkeeping." (account-service (append (operating-system-accounts os) (operating-system-groups os)) (operating-system-skeletons os)) - (service hurd-file-systems-service-type #f) + (service hurd-file-systems-service-type) (pam-root-service (operating-system-pam-services os)) (hurd-etc-service os) (service profile-service-type diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9b93620..8b4a2e2 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -89,8 +89,7 @@ inetutils less net-base openssh shepherd which)) (define %base-services/hurd - (list (service hurd-user-processes-service-type) - (service hurd-console-service-type + (list (service hurd-console-service-type (hurd-console-configuration (hurd hurd))) (service hurd-ttys-service-type (hurd-ttys-configuration (hurd hurd))) @@ -196,7 +195,9 @@ menuentry \"GNU\" { (@@ (gnu system) operating-system-etc-directory)) (define (hurd-shepherd-services os) - (append-map hurd-service->shepherd-service (operating-system-services os))) + (append-map hurd-service->shepherd-service + (cons (service hurd-user-processes-service-type) + (operating-system-services os)))) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach) (os %hurd-default-operating-system)) "Return a cross-built GNU/Hurd image."