guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/07: squash! gnu: hurd: Ensure startup scripts refer to the right prog


From: guix-commits
Subject: 06/07: squash! gnu: hurd: Ensure startup scripts refer to the right programs.
Date: Mon, 6 Apr 2020 13:33:25 -0400 (EDT)

civodul pushed a commit to branch wip-hurd-vm
in repository guix.

commit 165c19387c0bf6d6e3d400618f39859095ae7763
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 6 16:06:36 2020 +0200

    squash! gnu: hurd: Ensure startup scripts refer to the right programs.
---
 gnu/packages/hurd.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 83a05dc..6f6b20e 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -364,6 +364,9 @@ boot, since this cannot be done from GNU/Linux."
                (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
                  (("/libexec/")
                   (string-append out "/libexec/")))
+               (substitute* "daemons/console-run.c"
+                 (("/hurd/")
+                  (string-append out "/hurd/")))
 
                (substitute* '("daemons/runsystem.sh"
                               "daemons/runsystem.hurd.sh"
@@ -376,7 +379,8 @@ boot, since this cannot be done from GNU/Linux."
                  (("^SHELL=.*")
                   (string-append "SHELL=" bash "/bin/bash\n"))
                  (("/sbin/") (string-append out "/sbin/"))
-                 (("/libexec/") (string-append out "/libexec/")))
+                 (("/libexec/") (string-append out "/libexec/"))
+                 (("/hurd/") (string-append out "/hurd/")))
 
                (substitute* '("daemons/runsystem.sh"
                               "daemons/runsystem.hurd.sh")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]