janneke pushed a commit to branch wip-hurd
in repository guix.
commit 0e4d32a44f4017e349dbbd85272ae0c03de09f26
Author: Janneke Nieuwenhuizen <[email protected]>
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 <[email protected]>
;;; Copyright © 2020 Florian Pelz <[email protected]>
;;; Copyright © 2020, 2022 Maxim Cournoyer <[email protected]>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <[email protected]>
;;; Copyright © 2020, 2022 Efraim Flashner <[email protected]>
;;; Copyright © 2021 Maxime Devos <[email protected]>
;;; Copyright © 2021 raid5atemyhomework <[email protected]>
@@ -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?)
