guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/24: system: Support hurd activation service for the Hurd.


From: guix-commits
Subject: 12/24: system: Support hurd activation service for the Hurd.
Date: Sat, 6 Jun 2020 11:09:38 -0400 (EDT)

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

commit bf8957ecabfda975b279ef9f80b52a5b22c5a7b4
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun May 3 16:32:09 2020 +0200

    system: Support hurd activation service for the Hurd.
    
    * gnu/build/activation.scm (boot-time-system): Use "command-line" for the
    Hurd.
    * gnu/system.scm (hurd-default-essential-services): Add %boot-service and
    %activation-service.
---
 gnu/build/activation.scm | 4 +++-
 gnu/system.scm           | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 30f5e87..b915e6b 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -320,7 +320,9 @@ improvement."
 
 (define (boot-time-system)
   "Return the '--system' argument passed on the kernel command line."
-  (find-long-option "--system" (linux-command-line)))
+  (find-long-option "--system" (if (string-contains %host-type "linux-gnu")
+                                   linux-command-line
+                                   (command-line))))
 
 (define* (activate-current-system
           #:optional (system (or (getenv "GUIX_NEW_SYSTEM")
diff --git a/gnu/system.scm b/gnu/system.scm
index 72674fe..3b8051a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -58,6 +58,7 @@
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
+  #:use-module (gnu services hurd)
   #:use-module (gnu bootloader)
   #:use-module (gnu system shadow)
   #:use-module (gnu system nss)
@@ -601,6 +602,8 @@ bookkeeping."
 
 (define (hurd-default-essential-services os)
   (list (service system-service-type '())
+        %boot-service
+        %activation-service
         (service profile-service-type '())))
 
 (define* (operating-system-services os)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]