08/36: squash! Use static-networking for loopback

[guix-commits]

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

commit 6e0af83f0a59acb0366f130e458f1267c4554d56
Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Fri May 1 15:58:50 2020 +0200

    squash! Use static-networking for loopback
---
 gnu/services/hurd.scm | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 3686987..2f4b177 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -30,7 +30,6 @@
   #:use-module (ice-9 match)
   #:export (hurd-console-configuration
             hurd-console-service-type
-            hurd-loopback-service-type
             hurd-service->shepherd-service
             hurd-ttys-configuration
             hurd-ttys-service-type))
@@ -49,7 +48,7 @@
       (($ <hurd-console-configuration>) (hurd-console-shepherd-service config))
       (($ <hurd-ttys-configuration>) (hurd-ttys-shepherd-service config))
       (($ <syslog-configuration>) (syslog-shepherd-service config))
-      (('loopback) (hurd-loopback-shepherd-service #f))
+      ((($ <static-networking>)) (map static-networking-shepherd-service 
config))
       (('user-processes) (user-processes-shepherd-service '()))
       (_ '()))))
 
@@ -128,30 +127,14 @@
 
 
 ;;;
-;;; Dummy hurd-loopback service, required for guix-daemon.
+;;; Bridge for static-networking service.
 ;;;
 
-(define (hurd-loopback-shepherd-service _)
-  "Return the 'loopback' Shepherd service."
+(define <static-networking>
+  (@@ (gnu services base) <static-networking>))
 
-  (list (shepherd-service
-         (documentation "Dummy for bootstrapping (gnu services) on the Hurd.")
-         (provision '(loopback))
-         (requirement '())
-         (start #~(const #t))
-         (stop #~(const #t))
-         (respawn? #f))))
-
-(define hurd-loopback-service-type
-  (service-type
-   (name 'loopback)
-   (extensions (list (service-extension shepherd-root-service-type
-                                        hurd-loopback-shepherd-service)))
-   (compose concatenate)
-   (extend first-of-two)
-   (default-value '(loopback)) ;canary for hurd-service->shepherd-service
-   (description "Dummy service to bootstrap (gnu services) on the
-Hurd.")))
+(define static-networking-shepherd-service
+  (@@ (gnu services base) static-networking-shepherd-service))
 
 
 ;;;