janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 74c1a2bfca68c4b4bb173a532f8d0070dca4f111
Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Sun Apr 5 16:48:20 2020 +0200
Revert "HACK gnu: system: Add /libexec/ symlink; do not substitute
config/ttys."
This reverts commit 566bf515d047d7d9e09c1e3951755974cc4ef276.
---
gnu/packages/hurd.scm | 8 ++------
gnu/system/hurd.scm | 6 +-----
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index b3632e4..479ff90 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -359,10 +359,7 @@ boot, since this cannot be done from GNU/Linux."
(("/bin/login")
(string-append out "/bin/login"))
(("/bin/bash") (string-append bash "/bin/bash")))
- (substitute* '("startup/startup.c" "init/init.c"
- ;; XXX runttys fails to start getty with
/gnu/store file name!?!
- ;;"config/ttys"
- )
+ (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
(("/libexec/")
(string-append out "/libexec/")))
@@ -386,8 +383,7 @@ boot, since this cannot be done from GNU/Linux."
;; Let's try if writable / helps...
"mount -o remount,rw /\n"
;; Let's try if re-creating some nodes
helps...
- "MAKEDEV --devdir=/dev console null\n"
- "MAKEDEV --devdir=/dev tty1\n")))
+ "MAKEDEV --devdir=/dev console null\n")))
#t)))
(add-after 'patch-shebangs 'patch-libexec-shebangs
(lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index b9f94af..c8dbd65 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -115,11 +115,7 @@ menuentry \"GNU\" {
("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
hurd)
- "/etc/ttys"))
- ("/libexec" -> ,(file-append (with-parameters ((%current-target-system
- "i586-pc-gnu"))
- hurd)
- "/libexec"))))
+ "/etc/ttys"))))
(qemu-image #:file-system-type "ext2"
#:file-system-options '("-o" "hurd")
