guix-commits
[Top][All Lists]
Advanced

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

19/52: system: hurd: Add "/bin/sh" symlink.


From: guix-commits
Subject: 19/52: system: hurd: Add "/bin/sh" symlink.
Date: Thu, 9 Apr 2020 13:29:06 -0400 (EDT)

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

commit 53c5725dd44236264e35f41354c75c7dac6d9329
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 17:16:30 2020 +0200

    system: 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 7fe3a2b..d1c22a7 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")



reply via email to

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