From 3fb3bd3da530a5f82a169b1fa451474f9d90c3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 23 Oct 2022 12:20:55 +0200
Subject: [PATCH] system: hurd: Boot with the statically-linked 'exec' server.

This works around <https://issues.guix.gnu.org/58631>.

* gnu/system.scm (hurd-multiboot-modules): Use '/hurd/exec.static'
instead of 'ld.so /hurd/exec'.
---
 gnu/system.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index b7f19d741a..f92c7de8e3 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1492,8 +1492,14 @@ (define (hurd-multiboot-modules os)
                      (cross-libc target))
                    glibc))
          (exec-server-command
-          (list (file-append libc "/lib/ld.so.1") "exec"
-                (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'")))
+          ;; XXX: Run the statically-linked 'exec' to work around
+          ;; <https://issues.guix.gnu.org/58631>, which manifests on some
+          ;; machines.
+
+          ;; (list (file-append libc "/lib/ld.so.1") "exec"
+          ;;       (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)))
 
 (define* (operating-system-boot-parameters os root-device