[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/16: system: vm: Initial vm-image support for the Hurd.
From: |
guix-commits |
Subject: |
10/16: system: vm: Initial vm-image support for the Hurd. |
Date: |
Tue, 5 May 2020 13:14:17 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 25822e93bf67eac7a2a3dff341909834c8f3bdd0
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 | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 0b6d787..44bca92 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -810,7 +810,24 @@ 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"))
+ (directory "/etc")
+ ("/etc/ttys" -> ,(file-append hurd
"/etc/ttys")))
+ '())))
(qemu-image #:os os
#:bootcfg-drv bootcfg
#:bootloader (bootloader-configuration-bootloader
@@ -820,6 +837,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)))
- 06/16: system: hurd: Add hurd-default-essential-services., (continued)
- 06/16: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/05
- 07/16: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/05
- 05/16: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/05
- 09/16: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/05
- 12/16: services: hurd: Add hurd-etc-sevcices., guix-commits, 2020/05/05
- 08/16: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/05
- 11/16: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/05
- 16/16: HACK: hurd-etc-service: apply target force, guix-commits, 2020/05/05
- 13/16: system: Add hurd activation., guix-commits, 2020/05/05
- 14/16: DRAFT services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/05
- 10/16: system: vm: Initial vm-image support for the Hurd.,
guix-commits <=
- 15/16: HACK hurd-etc-service: add with-parameters *ugh*, guix-commits, 2020/05/05