ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This allows login.c to succeed for root.

* gnu/system/hurd.scm (cross-hurd-image): Link /bin/sh to full the full bash.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-05 17:16:30 +02:00 committed by Ludovic Courtès
parent 6598c6149b
commit fe1f9646b4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/system/hurd.scm
View file

@ -21,6 +21,7 @@ (define-module (gnu system hurd)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu bootloader grub) #:use-module (gnu bootloader grub)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu system vm) #:use-module (gnu system vm)
@ -44,7 +45,7 @@ (define hurd-os
(directory-union "gnu+hurd" (directory-union "gnu+hurd"
(cons (with-parameters ((%current-system "i686-linux")) (cons (with-parameters ((%current-system "i686-linux"))
gnumach) gnumach)
(for-hurd hurd coreutils grep sed))))) (for-hurd hurd bash coreutils grep sed)))))
(define grub.cfg (define grub.cfg
(let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu")) (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu"))
@ -122,7 +123,11 @@ (define hurd-directives
("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu")) "i586-pc-gnu"))
hurd) 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" (qemu-image #:file-system-type "ext2"
#:file-system-options '("-o" "hurd") #:file-system-options '("-o" "hurd")