24/28: DRAFT: system: vm: Activate the Hurd.

[guix-commits]

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

commit fb5e7d20da88d0e164fa6c887a83023d4308344b
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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 151cf62..c894c02 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -692,6 +692,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)
@@ -700,9 +701,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
@@ -711,7 +711,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)))