diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-25 21:50:59 +0300 |
| commit | 6ff203663e696b74e711ab09d6f4b35c2c332f0f (patch) | |
| tree | 4bf2c77c62fa60febba527a76b1ecffaa0a00a0d /gnu/system.scm | |
| parent | 408a4ed071c9c52de207d799a698781d49fa727d (diff) | |
| parent | a0751e3250dfea7e52468c8090e18c3118d93a60 (diff) | |
| download | guix-6ff203663e696b74e711ab09d6f4b35c2c332f0f.tar guix-6ff203663e696b74e711ab09d6f4b35c2c332f0f.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 12 |
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 |