[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/35: services: Add `hurd-console-service-type'.
From: |
guix-commits |
Subject: |
31/35: services: Add `hurd-console-service-type'. |
Date: |
Thu, 28 May 2020 13:03:34 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 5a38f9fbda2341b77251595e0694a86856a2ebe3
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Apr 12 22:17:03 2020 +0200
services: Add `hurd-console-service-type'.
* gnu/services/hurd.scm (<hurd-console-configuration>: New record.
(hurd-console-shepherd-service): New function.
(hurd-console-service-type): New variable.
* doc/guix.texi (Hurd Services): Document it.
---
doc/guix.texi | 16 ++++++++++++++++
gnu/services/hurd.scm | 43 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 2ac4b01..cfeb3d8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -26018,6 +26018,22 @@ parameters, can be done as follow:
@node Hurd Services
@subsection Hurd Services
+@defvr {Scheme Variable} hurd-console-service-type
+This service starts the fancy @code{VGA} console client on the Hurd.
+
+The service's value is a @code{hurd-console-configuration} record.
+@end defvr
+
+@deftp {Data Type} hurd-console-configuration
+This is the data type representing the configuration for the
+hurd-console-service.
+
+@table @asis
+@item @code{hurd} (default: @var{hurd})
+The Hurd package to use.
+@end table
+@end deftp
+
@deffn {Scheme Procedure} hurd-etc-service @var{os}
This service implements a minimal @code{etc-service}, adding some
specifics for the Hurd.
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 6e57b22..27c674c 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -18,11 +18,15 @@
(define-module (gnu services hurd)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages hurd)
#:use-module (gnu services)
+ #:use-module (gnu services shepherd)
#:use-module (gnu system)
#:use-module (guix gexp)
#:use-module (guix records)
- #:export (hurd-etc-service))
+ #:export (hurd-console-configuration
+ hurd-console-service-type
+ hurd-etc-service))
;;; Commentary:
;;;
@@ -58,4 +62,41 @@ fi\n"))
("login" ,(file-append hurd "/etc/login"))
("motd" ,(file-append hurd "/etc/motd"))))))
+;;;
+;;; The Hurd VGA console service.
+;;;
+
+(define-record-type* <hurd-console-configuration>
+ hurd-console-configuration make-hurd-console-configuration
+ hurd-console-configuration?
+ (hurd hurd-console-configuration-hurd ;package
+ (default hurd)))
+
+(define (hurd-console-shepherd-service config)
+ "Return a <shepherd-service> for a Hurd VGA console with CONFIG."
+
+ (define console-command
+ #~(list
+ (string-append #$(hurd-console-configuration-hurd config)
"/bin/console")
+ "-c" "/dev/vcs"
+ "-d" "vga"
+ "-d" "pc_kbd"
+ "-d" "generic_speaker"))
+
+ (list (shepherd-service
+ (documentation "Run the Hurd’s VGA console client.")
+ (provision '(console))
+ (requirement '(user-processes))
+ (start #~(make-forkexec-constructor #$console-command))
+ (stop #~(make-kill-destructor)))))
+
+(define hurd-console-service-type
+ (service-type
+ (name 'console)
+ (description "Run the Hurd console client.")
+ (extensions
+ (list (service-extension shepherd-root-service-type
+ hurd-console-shepherd-service)))
+ (default-value (hurd-console-configuration))))
+
;;; hurd.scm ends here
- 18/35: linux-boot: Update 'make-hurd-device-nodes'., (continued)
- 18/35: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/28
- 03/35: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/28
- 08/35: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/28
- 09/35: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/28
- 16/35: image: Do not use VM to create disk-images., guix-commits, 2020/05/28
- 21/35: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/28
- 23/35: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/28
- 25/35: system: Use 'hurd' package in label., guix-commits, 2020/05/28
- 26/35: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/28
- 29/35: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/28
- 31/35: services: Add `hurd-console-service-type'.,
guix-commits <=
- 32/35: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/28
- 04/35: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/28
- 10/35: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/28
- 12/35: image: Add bootloader installation support., guix-commits, 2020/05/28
- 19/35: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/28
- 20/35: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/28
- 22/35: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/28
- 27/35: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/28
- 11/35: bootloader: grub: Use inheritance to define grub-minimal-bootloader., guix-commits, 2020/05/28
- 24/35: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/28