2 files changed, 14 insertions, 4 deletions

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 0e4967012c8..bdf4aff9718 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -352,7 +352,8 @@ set to the given OS."
 (define-syntax-rule (with-imported-modules* gexp* ...)
   (with-extensions gcrypt-sqlite3&co
     (with-imported-modules `(,@(source-module-closure
-                                '((gnu build image)
+                                '((ice-9 optargs)
+                                  (gnu build image)
                                   (gnu build bootloader)
                                   (gnu build hurd-boot)
                                   (gnu build linux-boot)
@@ -360,7 +361,8 @@ set to the given OS."
                                 #:select? neither-config-nor-git?)
                              ((guix config) => ,(make-config.scm)))
       #~(begin
-          (use-modules (gnu build image)
+          (use-modules (ice-9 optargs)
+                       (gnu build image)
                        (gnu build bootloader)
                        (gnu build hurd-boot)
                        (gnu build linux-boot)
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm
index ba223b1e0cd..c65a9c8f13d 100644
--- a/gnu/system/images/hurd.scm
+++ b/gnu/system/images/hurd.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +22,7 @@
   #:use-module (gnu bootloader)
   #:use-module (gnu bootloader grub)
   #:use-module (gnu image)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages ssh)
   #:use-module (guix platforms x86)
   #:use-module (gnu services)
@@ -97,7 +98,14 @@
   #~(lambda* (#:rest args)
       (apply initialize-root-partition
              (append args
-                     (list #:make-device-nodes make-hurd-device-nodes
+                     (list #:make-device-nodes
+                           (lambda device-args
+                             (let-keywords (cdr args) #t
+                                           ((system-directory #f))
+                               (let ((hurd (in-vicinity system-directory
+                                                        "hurd/hurd")))
+                                 (apply make-hurd-device-nodes
+                                        (cons* #:hurd hurd device-args)))))
                            ;; XXX Creating a db.sqlite with journal_mode=WAL
                            ;; yields "unable to open database file" on GNU/Hurd
                            ;; for an sqlite with the hurd-locking-mode.patch;