[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/16: system: vm: Initial vm-image support for the Hurd.
From: |
guix-commits |
Subject: |
11/16: system: vm: Initial vm-image support for the Hurd. |
Date: |
Thu, 14 May 2020 17:32:10 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 5b980309ba8395fdb9a115b015514bcabf98433f
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)))
- 08/16: bootleader: Add `<hurd-menu-entry>'., (continued)
- 08/16: bootleader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/14
- 13/16: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/14
- 15/16: system: Add `hurd-activation'., guix-commits, 2020/05/14
- 16/16: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/14
- 03/16: syscalls: Adjust 'sockaddr-in', 'sockaddr-in6' structs for the Hurd., guix-commits, 2020/05/14
- 12/16: system: Use 'hurd' package in label., guix-commits, 2020/05/14
- 14/16: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/14
- 04/16: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/14
- 05/16: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/14
- 10/16: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/14
- 11/16: system: vm: Initial vm-image support for the Hurd.,
guix-commits <=