[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)))
- 18/36: system: hurd: Add guix., (continued)
- 18/36: system: hurd: Add guix., guix-commits, 2020/05/01
- 21/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/05/01
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01
- 36/36: HACK Don't fail on running host's localedef., guix-commits, 2020/05/01
- 28/36: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/01
- 29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd., guix-commits, 2020/05/01
- 34/36: WIP: gnu: services: Add %hurd-bare-metal-service., guix-commits, 2020/05/01
- 32/36: DRAFT system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/01
- 35/36: HACK system: vm: Add Hurd specifics.,
guix-commits <=
- 19/36: system: hurd: Add the guix service., guix-commits, 2020/05/01
- 26/36: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/01
- 27/36: system: Add hurd-operating-system-directory-base-entries., guix-commits, 2020/05/01
- 31/36: gnu: hurd: Switch system in RC., guix-commits, 2020/05/01
- 30/36: gnu: hurd: Cross-build hack: Set target i586-pc-gnu if unset., guix-commits, 2020/05/01
- 33/36: DRAFT: gnu: services: Use xprogram-file., guix-commits, 2020/05/01