summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-04-05 17:16:30 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-11 21:01:09 +0200
commitfe1f9646b4533fd4d3ec98bcfaa1b09391396e76 (patch)
treee1a30ac5533bacdd2e965f24b58ea6f0a5fbfb1e
parent6598c6149b28ea7ba3450e0081a55e2baabf1371 (diff)
downloadguix-fe1f9646b4533fd4d3ec98bcfaa1b09391396e76.tar.gz
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.
-rw-r--r--gnu/system/hurd.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 3926f11315..65706161cb 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"))
@@ -122,7 +123,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")