From 293e2c316005f2674b3cad32a2127c27a70b8ff6 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 4 Apr 2020 11:53:13 +0200 Subject: [PATCH 3/3] system: hurd: Add /bin/sh symlink. * gnu/system/hurd.scm (cross-hurd-image): Create /bin/sh symlink. --- gnu/system/hurd.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 97c54a2992..82a9d94d5c 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès ;;; Copyright © 2020 Rene Saavedra +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,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) @@ -45,7 +47,7 @@ (directory-union "gnu+hurd" (cons (with-parameters ((%current-system "i686-linux")) gnumach) - (for-hurd hurd coreutils grep sed))))) + (for-hurd hurd bash-minimal coreutils grep sed))))) (define grub.cfg (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) @@ -99,7 +101,11 @@ menuentry \"GNU\" { ("/libexec" -> ,(file-append (with-parameters ((%current-target-system "i586-pc-gnu")) hurd) - "/libexec")))) + "/libexec")) + ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system + "i586-pc-gnu")) + bash-minimal) + "/bin/sh")))) (qemu-image #:file-system-type "ext2" #:file-system-options '("-o" "hurd") -- 2.26.0