[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: hurd: Add /bin/sh symlink.
From: |
guix-commits |
Subject: |
09/09: gnu: hurd: Add /bin/sh symlink. |
Date: |
Sun, 5 Apr 2020 11:30:18 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit d22f72e865df2cbde46467d1458e98fe60766678
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 17:16:30 2020 +0200
gnu: hurd: Add /bin/sh symlink.
This allows login.c to succeed for root.
* gnu/system/hurd.scm (cross-hurd-image): Link /bin/sh to full the full
bash.
---
gnu/system/hurd.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c8dbd65..e2377d6 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -21,6 +21,7 @@
#:use-module (guix utils)
#:use-module (gnu bootloader grub)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages hurd)
#:use-module (gnu system vm)
@@ -44,7 +45,7 @@
(directory-union "gnu+hurd"
(cons (with-parameters ((%current-system "i686-linux"))
gnumach)
- (for-hurd hurd coreutils grep sed)))))
+ (for-hurd hurd bash coreutils grep sed)))))
(define grub.cfg
(let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu"))
@@ -115,7 +116,11 @@ menuentry \"GNU\" {
("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
hurd)
- "/etc/ttys"))))
+ "/etc/ttys"))
+ ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system
+ "i586-pc-gnu"))
+ bash)
+ "/bin/sh"))))
(qemu-image #:file-system-type "ext2"
#:file-system-options '("-o" "hurd")
- 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, 2020/04/05
- 09/09: gnu: hurd: Add /bin/sh symlink.,
guix-commits <=
- 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