03/03: squash! gnu: hurd: Ensure startup scripts refer to the right programs.

[guix-commits]

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

commit 2b8862b75c97f1b6943304200b01df43ff2e50ca
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Apr 7 14:47:04 2020 +0200

    squash! gnu: hurd: Ensure startup scripts refer to the right programs.
---
 gnu/packages/hurd.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 6f6b20e..e5ad8e4 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -382,14 +382,21 @@ boot, since this cannot be done from GNU/Linux."
                  (("/libexec/") (string-append out "/libexec/"))
                  (("/hurd/") (string-append out "/hurd/")))
 
-               (substitute* '("daemons/runsystem.sh"
-                              "daemons/runsystem.hurd.sh")
+               (substitute* "daemons/runsystem.sh"
                  (("export PATH")
                   (string-append "export PATH\n"
-                                 ;; 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")))
+                                 "\
+fsysopts / --writable
+
+# MAKEDEV relies on pipes so this needs to be set up.
+settrans -c /servers/socket/1 /hurd/pflocal
+
+(cd /dev; MAKEDEV -D /dev std vcs tty{1,2,3,4,5,6})\n")))
+
+               (substitute* "daemons/runsystem.hurd.sh"
+                 (("export PATH")
+                  "export PATH
+fsysopts / --writable\n"))
                #t)))
          (add-after 'patch-shebangs 'patch-libexec-shebangs
            (lambda* (#:key inputs outputs #:allow-other-keys)