summary refs log tree commit diff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-10-24 20:57:46 +0200
committerJan (janneke) Nieuwenhuizen <janneke@gnu.org>2024-11-11 07:28:32 +0100
commit046d6d9f8e5456d651cdc69b04dfae3af5230a98 (patch)
tree10fa10a8178f5d863079cb0b554fe2ad2363b746
parent4f94f07b1f98ebbdb7905c6ee562135e2e571b98 (diff)
downloadguix-046d6d9f8e5456d651cdc69b04dfae3af5230a98.tar.gz
guix system: When installing the Hurd, create essential devices.
* guix/scripts/system.scm (install): When installing the Hurd, invoke
`make-hurd-device-nodes'.

Change-Id: If84d5fe0b5bf4a93452f0b5241650f325d583543
-rw-r--r--guix/scripts/system.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 99c58f3812..7989b183ad 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
@@ -63,6 +63,7 @@
   #:autoload   (guix progress) (progress-reporter/bar
                                 call-with-progress-reporter)
   #:use-module ((guix docker) #:select (%docker-image-max-layers))
+  #:use-module (gnu build hurd-boot)
   #:use-module (gnu build image)
   #:use-module (gnu build install)
   #:autoload   (gnu build file-systems)
@@ -243,6 +244,9 @@ the ownership of '~a' may be incorrect!~%")
       (delete-file-recursively state)))
 
   (chmod target #o755)
+  ;; For the Hurd to boot, it needs some essential device nodes.
+  (when (target-hurd?)
+    (make-hurd-device-nodes target))
   (let ((os-dir   (derivation->output-path os-drv))
         (format   (lift format %store-monad))
         (populate (lift2 populate-root-file-system %store-monad)))