[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/24: hurd-boot: Setup pci-arbiter and rumpdisk translators.
From: |
guix-commits |
Subject: |
14/24: hurd-boot: Setup pci-arbiter and rumpdisk translators. |
Date: |
Thu, 13 Jul 2023 13:02:37 -0400 (EDT) |
jpoiret pushed a commit to branch master
in repository guix.
commit fe873fb417258e66d74d416745bdc1bfd7f0eba4
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed May 17 07:16:26 2023 +0200
hurd-boot: Setup pci-arbiter and rumpdisk translators.
* gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "servers/bus/pci.
(set-hurd-device-translators): Create transators for pci-arbiter, rumpdisk,
and /dev/wd0..3s1..4.
Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
---
gnu/build/hurd-boot.scm | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 95c15907dd..18b7feabc3 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -105,7 +105,7 @@ Return the value associated with OPTION, or #f on failure."
;; TODO: Set the 'gnu.translator' extended attribute for passive translator
;; settings?
- )
+ (mkdir-p (scope "servers/bus/pci")))
(define (passive-translator-xattr? file-name)
"Return true if FILE-NAME has an extended @code{gnu.translator} attribute
@@ -183,7 +183,8 @@ set."
(mkdir-p dir))))
(define servers
- '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
+ '(("servers/bus/pci" ("/hurd/pci-arbiter"))
+ ("servers/crash-dump-core" ("/hurd/crash" "--dump-core"))
("servers/crash-kill" ("/hurd/crash" "--kill"))
("servers/crash-suspend" ("/hurd/crash" "--suspend"))
("servers/password" ("/hurd/password"))
@@ -213,6 +214,8 @@ set."
;; 'fd_to_filename' in libc expects it.
("dev/fd" ("/hurd/magic" "--directory" "fd") #o555)
+ ("dev/rumpdisk" ("/hurd/rumpdisk") #o660)
+
;; Create a number of ttys; syslogd writes to tty12 by default.
;; FIXME: Creating /dev/tty12 leads the console client to switch to
;; tty12 when syslogd starts, which is confusing for users. Thus, do
@@ -236,7 +239,22 @@ set."
("/hurd/term" ,(string-append "/dev/ttyp" n)
"pty-slave" ,(string-append "/dev/ptyp" n))
#o666))))
- (iota 10 0))))
+ (iota 10 0))
+ ,@(append-map (lambda (n)
+ (let* ((n (number->string n))
+ (drive (string-append "dev/wd" n))
+ (disk (string-append "@/dev/disk:wd" n)))
+ `((,drive ("/hurd/storeio" ,disk) #o600)
+ ,@(map (lambda (p)
+ (let ((p (number->string p)))
+ `(,(string-append drive "s" p)
+ ("/hurd/storeio"
+ "--store-type=typed"
+ ,(string-append
+ "part:" p ":device:" disk))
+ #o660)))
+ (iota 4 1)))))
+ (iota 4 0))))
(for-each scope-set-translator servers)
(mkdir* "dev/vcs/1")
@@ -249,6 +267,7 @@ set."
(false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout")))
(false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))
(false-if-EEXIST (symlink "crash-dump-core" (scope "servers/crash")))
+ (false-if-EEXIST (symlink "/dev/rumpdisk" (scope "dev/disk")))
;; Make sure /etc/mtab is a symlink to /proc/mounts.
(false-if-exception (delete-file (scope "etc/mtab")))
- 10/24: gnu: Add rumpkernel., (continued)
- 10/24: gnu: Add rumpkernel., guix-commits, 2023/07/13
- 17/24: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/07/13
- 19/24: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/07/13
- 20/24: hurd-boot: Cater for netdde., guix-commits, 2023/07/13
- 02/24: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/07/13
- 03/24: gnu: hurd: Update supported systems., guix-commits, 2023/07/13
- 05/24: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/07/13
- 07/24: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/07/13
- 09/24: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/07/13
- 12/24: gnu: parted: Support building for the Hurd., guix-commits, 2023/07/13
- 14/24: hurd-boot: Setup pci-arbiter and rumpdisk translators.,
guix-commits <=
- 16/24: system: hurd: Boot with pci.arbiter and rumpdisk., guix-commits, 2023/07/13
- 18/24: gnu: gnumach: Support "noide" argument., guix-commits, 2023/07/13
- 22/24: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/07/13
- 23/24: gnu: gnumach: Disable builtin networking., guix-commits, 2023/07/13
- 24/24: guix: platform: Use srfi-34's raise instead of raise-exception., guix-commits, 2023/07/13
- 11/24: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/07/13
- 13/24: gnu: hurd: Add rumpkernel., guix-commits, 2023/07/13
- 15/24: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/07/13
- 21/24: system: hurd: Add netdde to %base-packages/hurd., guix-commits, 2023/07/13