janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit caf20bfbc9f500847a2034484ab15ec71099a3f4
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
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, 15 insertions(+), 3 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 8cccb3f..c386283 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -650,16 +650,28 @@ 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))
+ (bootloader (bootloader-configuration-bootloader
+ (operating-system-bootloader os)))
+ (hurd (operating-system-hurd os))
+ (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
- (operating-system-bootloader os))
+ #:bootloader bootloader
#:disk-image-size disk-image-size
#:file-system-type file-system-type
#:file-system-uuid root-uuid
#:inputs `(("system" ,os)
("bootcfg" ,bootcfg))
+ #:extra-directives hurd-directives
#:copy-inputs? #t)))
