summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-05-03 16:32:09 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2020-06-08 14:12:20 +0200
commitc3fd2df705695a0dc9f393545606360be1ea6104 (patch)
treec3f53c3d10d5ff89bb41ec117baaf1fdc3e6c3b8 /gnu
parent59bcffa314171294278444aad4b7012abe50257a (diff)
system: Support 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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/activation.scm4
-rw-r--r--gnu/system.scm2
2 files changed, 5 insertions, 1 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 30f5e87d5a..b915e6bb67 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 a37c5ba4f3..4c23178b18 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -601,6 +601,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)