[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/24: DRAFT: system: vm: Activate the Hurd.
From: |
guix-commits |
Subject: |
20/24: DRAFT: system: vm: Activate the Hurd. |
Date: |
Sun, 17 May 2020 06:00:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3c495d79b4679bc871368e2e3087d7cdc016d273
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Wed May 6 10:10:59 2020 +0200
DRAFT: system: vm: Activate the Hurd.
* gnu/system/vm.scm (system-qemu-image): Add boot-activation.
---
gnu/system/vm.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 34f967a..4c41011 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -668,6 +668,7 @@ of the GNU system as described by OS."
(bootloader (bootloader-configuration-bootloader
(operating-system-bootloader os)))
(hurd (operating-system-hurd os))
+ (boot-activation (and hurd (operating-system-activation-script os)))
(hurd-directives (if hurd
`((directory "/servers")
,@(map (lambda (server)
@@ -676,9 +677,8 @@ of the GNU system as described by OS."
"default-pager" "crash-dump-core"
"kill" "suspend"))
("/hurd" -> ,(file-append hurd "/hurd"))
- ;; XXX remove ttys after adding hurd-getty
service
- (directory "/etc")
- ("/etc/ttys" -> ,(file-append hurd
"/etc/ttys")))
+ (directory "/boot")
+ ("/boot/activation" -> ,boot-activation))
'())))
(qemu-image #:os os
#:bootcfg-drv bootcfg
@@ -687,7 +687,10 @@ of the GNU system as described by OS."
#:file-system-type file-system-type
#:file-system-uuid root-uuid
#:inputs `(("system" ,os)
- ("bootcfg" ,bootcfg))
+ ("bootcfg" ,bootcfg)
+ ,@(if hurd
+ `(("boot-activation" ,boot-activation))
+ '()))
#:extra-directives hurd-directives
#:copy-inputs? #t)))
- 08/24: system: Add 'hurd' field to <boot-parameters>., (continued)
- 08/24: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/17
- 16/24: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/17
- 07/24: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/17
- 09/24: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/17
- 13/24: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/17
- 12/24: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/17
- 14/24: system: Add `hurd-activation'., guix-commits, 2020/05/17
- 17/24: services: Add `hurd-console-service-type'., guix-commits, 2020/05/17
- 18/24: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/17
- 19/24: system: hurd: Populate services., guix-commits, 2020/05/17
- 20/24: DRAFT: system: vm: Activate the Hurd.,
guix-commits <=
- 21/24: system: bare-hurd.tmpl: Add openssh client and service., guix-commits, 2020/05/17
- 22/24: gnu: linux-libre: Add support for gnu.* namespace., guix-commits, 2020/05/17
- 23/24: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/17
- 06/24: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/17
- 04/24: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/17
- 10/24: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/17
- 15/24: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/17
- 24/24: system: hurd: Remove bash from boot process., guix-commits, 2020/05/17