[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/")))
- branch wip-hurd-vm updated (265eed6 -> d22f72e), guix-commits, 2020/04/05
- 02/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/05
- 01/09: gnu: hurd: Add ttys symlink in /etc/ttys., guix-commits, 2020/04/05
- 03/09: HACK: gnu hurd: Recreate some device nodes., guix-commits, 2020/04/05
- 04/09: gnu: hurd: Add /etc/passwd., guix-commits, 2020/04/05
- 05/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs.,
guix-commits <=
- 09/09: gnu: hurd: Add /bin/sh symlink., guix-commits, 2020/04/05
- 06/09: HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys., guix-commits, 2020/04/05
- 08/09: Revert "HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys.", guix-commits, 2020/04/05
- 07/09: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names., guix-commits, 2020/04/05