02/02: REVERTME: THE-SHEPHERD-HANGS!!! WIP Remove hurd filtered services hack

[guix-commits]

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

commit 94a1e47d3ec391c3938d8c4e3b0befe3b05d5b7b
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat May 2 12:18:30 2020 +0200

    REVERTME: THE-SHEPHERD-HANGS!!! WIP Remove hurd filtered services hack
    
    * gnu/system/vm.scm (system-qemu-image): Comment-out shepherd.conf-hack 
overrides.
---
 gnu/system/vm.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index d279a1c..369066e 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -851,13 +851,13 @@ of the GNU system as described by OS."
          (boot-activation (and (hurd-target?)
                                (cross-built
                                 (operating-system-activation-script os))))
-         (shepherd.conf (and (hurd-target?) (hurd-shepherd.conf-hack os)))
+         ;;(shepherd.conf (and (hurd-target?) (hurd-shepherd.conf-hack os)))
          (os (if hurd-cross?
                  (with-parameters ((%current-target-system "i586-pc-gnu")) os)
                  os))
          (bootcfg (if hurd-cross? (cross-built bootcfg) bootcfg))
          (hurd (and (hurd-target?) (if hurd-cross? (cross-built hurd))))
-         (etc-shepherd.conf (if hurd-cross? (cross-built shepherd.conf) 
shepherd.conf))
+         ;;(etc-shepherd.conf (if hurd-cross? (cross-built shepherd.conf) 
shepherd.conf))
          (etc-motd (and hurd (file-append hurd "/etc/motd")))
          (etc-ttys (and hurd (file-append hurd "/etc/ttys")))
          (etc-login (and hurd (file-append hurd "/etc/login")))
@@ -872,7 +872,7 @@ of the GNU system as described by OS."
                                 (directory "/boot")
                                 ("/boot/activation" -> ,boot-activation)
                                 (directory "/etc")
-                                ("/etc/shepherd.conf" -> ,etc-shepherd.conf)
+                                ;;("/etc/shepherd.conf" -> ,etc-shepherd.conf)
                                 ("/etc/fstab" -> ,%hurd-boot-fstab)
                                 ("/etc/login" -> ,etc-login)
                                 ("/etc/motd" -> ,etc-motd)
@@ -900,7 +900,7 @@ of the GNU system as described by OS."
                                     ("passwd" ,%hurd-boot-passwd)
                                     ("group" ,%hurd-boot-group)
                                     ("shadow" ,%hurd-boot-shadow)
-                                    ("shepherd.conf" ,etc-shepherd.conf)
+                                    ;;("shepherd.conf" ,etc-shepherd.conf)
                                     ("ttys" ,etc-ttys))
                                   '()))
                  #:extra-directives hurd-directives