09/21: system: vm: Initial vm-image support for the Hurd.

[guix-commits]

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

commit 6a98dfde7b3b7336380050ba72cb0e9612b84759
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 30 15:40:26 2020 +0200

    system: vm: Initial vm-image support for the Hurd.
    
    * gnu/system/vm.scm (system-qemu-image): When building for the Hurd, add
    hurd-directives.
---
 gnu/system/vm.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 48cc3d2..33e1c18 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -650,7 +650,22 @@ of the GNU system as described by OS."
                                      (device root-uuid)
                                      (type file-system-type))
                                    file-systems-to-keep))))
-         (bootcfg (operating-system-bootcfg os)))
+         (bootcfg (operating-system-bootcfg os))
+         (hurd (operating-system-hurd os))
+         (target (%current-target-system))
+         (hurd (and hurd (if target
+                             (with-parameters ((%current-target-system target))
+                               hurd)
+                             hurd)))
+         (hurd-directives (if hurd
+                              `((directory "/servers")
+                                ,@(map (lambda (server)
+                                         `(file ,(string-append "/servers/" 
server)))
+                                       '("startup" "exec" "proc" "password"
+                                         "default-pager" "crash-dump-core"
+                                         "kill" "suspend"))
+                                ("/hurd" -> ,(file-append hurd "/hurd")))
+                              '())))
     (qemu-image  #:os os
                  #:bootcfg-drv bootcfg
                  #:bootloader (bootloader-configuration-bootloader
@@ -660,6 +675,7 @@ of the GNU system as described by OS."
                  #:file-system-uuid root-uuid
                  #:inputs `(("system" ,os)
                             ("bootcfg" ,bootcfg))
+                 #:extra-directives hurd-directives
                  #:copy-inputs? #t)))