guix-commits
[Top][All Lists]
Advanced

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

05/09: squash! gnu: hurd: Ensure startup scripts refer to the right prog


From: guix-commits
Subject: 05/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs.
Date: Sun, 5 Apr 2020 11:30:16 -0400 (EDT)

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

commit 8f1a63d10ac24c3f7a0eb929abddcd07091ab196
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 15:43:17 2020 +0200

    squash! gnu: hurd: Ensure startup scripts refer to the right programs.
    
    * gnu/packages/hurd.scm (hurd): Substitute /bin/bash in utils/login.c.
---
 gnu/packages/hurd.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 05c05cd..479ff90 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -355,9 +355,10 @@ boot, since this cannot be done from GNU/Linux."
                     (sed  (assoc-ref inputs "sed"))
                     (grep (assoc-ref inputs "grep"))
                     (util-linux (assoc-ref inputs "util-linux")))
-               (substitute* '("daemons/runttys.c" "daemons/getty.c")
+               (substitute* '("daemons/runttys.c" "daemons/getty.c" 
"utils/login.c")
                  (("/bin/login")
-                  (string-append out "/bin/login")))
+                  (string-append out "/bin/login"))
+                 (("/bin/bash") (string-append bash "/bin/bash")))
                (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
                  (("/libexec/")
                   (string-append out "/libexec/")))



reply via email to

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