[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/47: system: hurd: Boot with pci.arbiter and rumpdisk.
From: |
guix-commits |
Subject: |
19/47: system: hurd: Boot with pci.arbiter and rumpdisk. |
Date: |
Sat, 3 Jun 2023 07:23:38 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 0e4d32a44f4017e349dbbd85272ae0c03de09f26
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon May 15 19:11:35 2023 +0200
system: hurd: Boot with pci.arbiter and rumpdisk.
* gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and
rumpdisk.
---
gnu/build/hurd-boot.scm | 2 +-
gnu/system.scm | 25 ++++++++++++++++++++-----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 7cfffc876e..84eec85f5b 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -251,7 +251,7 @@ set."
("/hurd/storeio"
"--store-type=typed"
,(string-append
- "part:" p ":device:@" disk))
+ "part:" p ":device:" disk))
#o660)))
(iota 4 1)))))
(iota 4 0))))
diff --git a/gnu/system.scm b/gnu/system.scm
index 354f58f55b..23addf41e9 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jannek@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <jannek@gnu.org>
;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
@@ -1486,16 +1486,28 @@ a list of <menu-entry>, to populate the \"old entries\"
menu."
(define (hurd-multiboot-modules os)
(let* ((hurd (operating-system-hurd os))
+ (pci-arbiter-command
+ (list (file-append hurd "/hurd/pci-arbiter.static")
+ "pci-arbiter"
+ "--host-priv-port='${host-port}'"
+ "--device-master-port='${device-port}'"
+ "--next-task='${disk-task}'"
+ "'$(pci-task=task-create)'"
+ "'$(task-resume)'"))
+ (rumpdisk-command
+ (list (file-append hurd "/hurd/rumpdisk.static")
+ "rumpdisk"
+ "--next-task='${fs-task}'"
+ "'$(disk-task=task-create)'"))
(root-file-system-command
(list (file-append hurd "/hurd/ext2fs.static")
"ext2fs"
"--multiboot-command-line='${kernel-command-line}'"
- "--host-priv-port='${host-port}'"
- "--device-master-port='${device-port}'"
"--exec-server-task='${exec-task}'"
"--store-type=typed"
"--x-xattr-translator-records"
- "'${root}'" "'$(task-create)'" "'$(task-resume)'"))
+ "'${root}'"
+ "'$(fs-task=task-create)'"))
(target (%current-target-system))
(libc (if target
(with-parameters ((%current-target-system #f))
@@ -1512,7 +1524,10 @@ a list of <menu-entry>, to populate the \"old entries\"
menu."
;; (file-append hurd "/hurd/exec")
"'$(exec-task=task-create)'")
(list (file-append hurd "/hurd/exec.static") "exec"
"'$(exec-task=task-create)'")))
- (list root-file-system-command exec-server-command)))
+ (list pci-arbiter-command
+ rumpdisk-command
+ root-file-system-command
+ exec-server-command)))
(define* (operating-system-boot-parameters os root-device
#:key system-kernel-arguments?)
- 27/47: gnu: commencement: Add autoconf-boot0., (continued)
- 27/47: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/03
- 26/47: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/03
- 28/47: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/03
- 34/47: gnu: commencement: glibc-final: Use libc-for-target for source too., guix-commits, 2023/06/03
- 33/47: gnu: commencement: glibc-final-with-bootstrap-bash: Use libc-for-target., guix-commits, 2023/06/03
- 42/47: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/03
- 01/47: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/03
- 04/47: gnu: hurd: Update supported systems., guix-commits, 2023/06/03
- 07/47: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/03
- 14/47: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/03
- 19/47: system: hurd: Boot with pci.arbiter and rumpdisk.,
guix-commits <=
- 31/47: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/03
- 35/47: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/06/03
- 37/47: gnu: coreutils: Skip hanging and failing test for the Hurd., guix-commits, 2023/06/03
- 39/47: Revert "gnu: sed: Skip failing test on GNU/Hurd.", guix-commits, 2023/06/03
- 40/47: gnu: findutils: Move test-strerror_r from XFAIL to skip for the Hurd., guix-commits, 2023/06/03
- 09/47: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/03
- 12/47: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/03
- 22/47: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/03
- 41/47: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS for the Hurd., guix-commits, 2023/06/03
- 08/47: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/03