01/04: squash! (somewhere) services: hurd: Remove second console-fancy? thing.

[guix-commits]

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

commit ccdf7336dfbb16bfc7a08b297ad9cabbe2663f55
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue Apr 14 08:10:35 2020 +0200

    squash! (somewhere) services: hurd: Remove second console-fancy? thing.
    
    The console -> ttys -> console'fancy dependency exists only in my head.
    Starting a second console messes things up badly.
    
    * gnu/services/hurd.scm (gnu): Remove dependency on ttys when fancy? is 
true.
    * gnu/system/hurd.scm (%base-services/hurd): Remove second `fancy?' console
    service.
---
 gnu/services/hurd.scm | 8 ++++----
 gnu/system/hurd.scm   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index ef9c966..65d84c0 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -29,8 +29,8 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
-  #:export (hurd-console-configuration
-            fancy?
+  #:export (fancy?
+            hurd-console-configuration
             hurd-console-service-type
             hurd-loopback-service-type
             hurd-service->shepherd-service
@@ -137,8 +137,8 @@ Hurd.")))
   (let ((fancy? (hurd-console-configuration-fancy? config)))
     (list (shepherd-service
            (documentation "Hurd console.")
-           (provision (if fancy? '(fancy-console) '(console)))
-           (requirement (if fancy? '(ttys) '()))
+           (provision '(console))
+           (requirement '())
            (start #~(lambda _ (fork+exec-command #$console-command) #t))
            (stop #~(make-kill-destructor))))))
 
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 1009745..fa2d6fa 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -83,8 +83,6 @@
                   (extra-options '("--disable-chroot"
                                    "--disable-deduplication"
                                    "--max-jobs=1"))))
-        (service hurd-console-service-type
-                 (hurd-console-configuration (hurd hurd) (fancy? #t)))
         (service hurd-loopback-service-type)
         (syslog-service)))