03/04: linux-boot: Update 'make-hurd-device-nodes'.

[guix-commits]

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

commit c378a2beece4c84831b30d03083010193c66ec8e
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun May 24 12:41:32 2020 +0200

    linux-boot: Update 'make-hurd-device-nodes'.
    
    * gnu/system/vm.scm (system-qemu-image): Move creating of "/servers/..." 
from
    extra-directives to ...
    * gnu/build/linux-boot.scm (make-hurd-device-nodes): ... here.
---
 gnu/build/linux-boot.scm | 13 +++++++++++++
 gnu/system/vm.scm        |  8 +-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index f08bb11..7dd509d 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -347,6 +347,19 @@ one specific hardware device. These we have to create."
   ;; console-run on first boot.
 
   (mkdir (scope "servers"))
+  (for-each (lambda (file)
+              (call-with-output-file (scope (string-append "servers/" file))
+                (lambda (port)
+                  (chmod port #o444))))
+            '("startup"
+              "exec"
+              "proc"
+              "password"
+              "default-pager"
+              "crash-dump-core"
+              "kill"
+              "suspend"))
+
   (mkdir (scope "servers/socket"))
   ;; Don't create /servers/socket/1 & co: runsystem does that on first boot.
 
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index c894c02..30cb94b 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -694,13 +694,7 @@ of the GNU system as described by OS."
          (hurd (operating-system-hurd os))
          (boot-activation (and hurd (operating-system-activation-script os)))
          (hurd-directives (if hurd
-                              `((directory "/servers")
-                                ,@(map (lambda (server)
-                                         `(file ,(string-append "/servers/" 
server)))
-                                       '("startup" "exec" "proc" "password"
-                                         "default-pager" "crash-dump-core"
-                                         "kill" "suspend"))
-                                ("/hurd" -> ,(file-append hurd "/hurd"))
+                              `(("/hurd" -> ,(file-append hurd "/hurd"))
                                 (directory "/boot")
                                 ("/boot/activation" -> ,boot-activation))
                               '())))