guix-commits
[Top][All Lists]
Advanced

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

35/36: HACK system: vm: Add Hurd specifics.


From: guix-commits
Subject: 35/36: HACK system: vm: Add Hurd specifics.
Date: Fri, 1 May 2020 11:54:04 -0400 (EDT)

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

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

    HACK system: vm: Add Hurd specifics.
---
 gnu/system/vm.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 9a63bee..12caec4 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -809,7 +809,9 @@ 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 (and (hurd-target?)
+                    (with-parameters ((%current-target-system "i586-pc-gnu")) 
hurd))))
     (qemu-image  #:os os
                  #:bootcfg-drv bootcfg
                  #:bootloader (bootloader-configuration-bootloader
@@ -819,6 +821,16 @@ of the GNU system as described by OS."
                  #:file-system-uuid root-uuid
                  #:inputs `(("system" ,os)
                             ("bootcfg" ,bootcfg))
+                 #:extra-directives
+                 (if (hurd-target?)
+                     `((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")))
+                     '())
                  #:copy-inputs? #t)))
 
 



reply via email to

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