janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3c495d79b4679bc871368e2e3087d7cdc016d273
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Wed May 6 10:10:59 2020 +0200
DRAFT: system: vm: Activate the Hurd.
* gnu/system/vm.scm (system-qemu-image): Add boot-activation.
---
gnu/system/vm.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 34f967a..4c41011 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -668,6 +668,7 @@ of the GNU system as described by OS."
(bootloader (bootloader-configuration-bootloader
(operating-system-bootloader os)))
(hurd (operating-system-hurd os))
+ (boot-activation (and hurd (operating-system-activation-script os)))
(hurd-directives (if hurd
`((directory "/servers")
,@(map (lambda (server)
@@ -676,9 +677,8 @@ of the GNU system as described by OS."
"default-pager" "crash-dump-core"
"kill" "suspend"))
("/hurd" -> ,(file-append hurd "/hurd"))
- ;; XXX remove ttys after adding hurd-getty
service
- (directory "/etc")
- ("/etc/ttys" -> ,(file-append hurd
"/etc/ttys")))
+ (directory "/boot")
+ ("/boot/activation" -> ,boot-activation))
'())))
(qemu-image #:os os
#:bootcfg-drv bootcfg
@@ -687,7 +687,10 @@ of the GNU system as described by OS."
#:file-system-type file-system-type
#:file-system-uuid root-uuid
#:inputs `(("system" ,os)
- ("bootcfg" ,bootcfg))
+ ("bootcfg" ,bootcfg)
+ ,@(if hurd
+ `(("boot-activation" ,boot-activation))
+ '()))
#:extra-directives hurd-directives
#:copy-inputs? #t)))
