[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: HACK gnu: system: Add /libexec/ symlink; do not substitute config
From: |
guix-commits |
Subject: |
06/09: HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys. |
Date: |
Sun, 5 Apr 2020 11:30:17 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 566bf515d047d7d9e09c1e3951755974cc4ef276
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 16:04:07 2020 +0200
HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys.
XXX: It /seems/ that runttys.c fails to start
/gnu/store/.../libexec/getty
and only want to start
/libexec/getty
* gnu/system/hurd.scm (cross-hurd-image): Add /libexec symlink.
* gnu/packages/hurd.scm (hurd): XXX Do not substitute config/ttys.
In runsystem: Create tty1 node.
---
gnu/packages/hurd.scm | 8 ++++++--
gnu/system/hurd.scm | 6 +++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 479ff90..b3632e4 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -359,7 +359,10 @@ 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" "config/ttys")
+ (substitute* '("startup/startup.c" "init/init.c"
+ ;; XXX runttys fails to start getty with
/gnu/store file name!?!
+ ;;"config/ttys"
+ )
(("/libexec/")
(string-append out "/libexec/")))
@@ -383,7 +386,8 @@ 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 console null\n"
+ "MAKEDEV --devdir=/dev tty1\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 c8dbd65..b9f94af 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -115,7 +115,11 @@ menuentry \"GNU\" {
("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
hurd)
- "/etc/ttys"))))
+ "/etc/ttys"))
+ ("/libexec" -> ,(file-append (with-parameters ((%current-target-system
+ "i586-pc-gnu"))
+ hurd)
+ "/libexec"))))
(qemu-image #:file-system-type "ext2"
#:file-system-options '("-o" "hurd")
- branch wip-hurd-vm updated (265eed6 -> d22f72e), guix-commits, 2020/04/05
- 02/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/05
- 01/09: gnu: hurd: Add ttys symlink in /etc/ttys., guix-commits, 2020/04/05
- 03/09: HACK: gnu hurd: Recreate some device nodes., guix-commits, 2020/04/05
- 04/09: gnu: hurd: Add /etc/passwd., guix-commits, 2020/04/05
- 05/09: squash! gnu: hurd: Ensure startup scripts refer to the right programs., guix-commits, 2020/04/05
- 09/09: gnu: hurd: Add /bin/sh symlink., guix-commits, 2020/04/05
- 06/09: HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys.,
guix-commits <=
- 08/09: Revert "HACK gnu: system: Add /libexec/ symlink; do not substitute config/ttys.", guix-commits, 2020/04/05
- 07/09: gnu: cross-libc: Add patch to allow 'gettyent' reading store file names., guix-commits, 2020/04/05