diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-05-15 19:11:35 +0200 |
|---|---|---|
| committer | Josselin Poiret <dev@jpoiret.xyz> | 2023-07-13 18:59:06 +0200 |
| commit | 7f86dad6115f9cc981a789c2c5ba0015206c5ee3 (patch) | |
| tree | e914a7f4e16ca4e02db213542a2bf6ed61a2587b | |
| parent | 09657f3ee70d232f1c7eb21d0bbef98181138a31 (diff) | |
system: hurd: Boot with pci.arbiter and rumpdisk.
* gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and
rumpdisk.
Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
| -rw-r--r-- | gnu/system.scm | 25 |
1 files changed, 20 insertions, 5 deletions
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?) |