guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/09: gnu: hurd: Add ttys symlink in /etc/ttys.


From: guix-commits
Subject: 01/09: gnu: hurd: Add ttys symlink in /etc/ttys.
Date: Sun, 5 Apr 2020 11:30:15 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit ee2db6cd2b8f38cad1fd8f8093787e8bfd1a1c8b
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 5 13:51:56 2020 +0200

    gnu: hurd: Add ttys symlink in /etc/ttys.
    
    * gnu/packages/hurd.scm (hurd): Substitute /libexec/.
    * gnu/system/hurd.scm (cross-hurd-image): Add symlink /etc/ttys =>
    <hurd>/etc/ttys.
---
 gnu/packages/hurd.scm | 2 +-
 gnu/system/hurd.scm   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 29f38ce..2f6c13c 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -358,7 +358,7 @@ boot, since this cannot be done from GNU/Linux."
                (substitute* '("daemons/runttys.c" "daemons/getty.c")
                  (("/bin/login")
                   (string-append out "/bin/login")))
-               (substitute* '("startup/startup.c" "init/init.c")
+               (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
                  (("/libexec/")
                   (string-append out "/libexec/")))
 
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 862e8ec..4f013e8 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -103,7 +103,12 @@ menuentry \"GNU\" {
                                                    "i586-pc-gnu"))
                                   hurd)
                                 "/hurd"))
-      ("/etc/fstab" -> ,fstab)))
+      ("/etc/fstab" -> ,fstab)
+      ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in 
runttys.c?
+      ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system
+                                                   "i586-pc-gnu"))
+                                  hurd)
+                                "/etc/ttys"))))
 
   (qemu-image #:file-system-type "ext2"
               #:file-system-options '("-o" "hurd")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]