summary refs log tree commit diff
path: root/gnu/system.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index b7f19d741a..3478afcec4 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -578,7 +578,7 @@ marked as 'needed-for-boot'."
 
 (define (boot-file-system-service os)
   "Return a service which adds, to the system profile, packages providing the
-utilites for the file systems marked as 'needed-for-boot' in OS."
+utilities for the file systems marked as 'needed-for-boot' in OS."
   (let ((file-systems (filter file-system-needed-for-boot?
                               (operating-system-file-systems os))))
     (simple-service 'boot-file-system-utilities profile-service-type
@@ -1492,8 +1492,14 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
                      (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