[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 18:23:37 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 99cacace9a9764bedb5a540a2b86352d928183cd
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, 15 insertions(+), 3 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 48cc3d2..40a98ef 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)))
- 04/16: system: vm: Fix for cross-build to the Hurd., (continued)
- 04/16: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/14
- 07/16: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/14
- 03/16: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/14
- 08/16: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/14
- 10/16: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/14
- 06/16: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/14
- 05/16: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/14
- 12/16: system: Use 'hurd' package in label., guix-commits, 2020/05/14
- 16/16: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/14
- 09/16: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/14
- 11/16: system: vm: Initial vm-image support for the Hurd.,
guix-commits <=
- 13/16: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/14
- 14/16: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/14
- 15/16: system: Add `hurd-activation'., guix-commits, 2020/05/14