[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/36: squash! Use static-networking for loopback
From: |
guix-commits |
Subject: |
08/36: squash! Use static-networking for loopback |
Date: |
Fri, 1 May 2020 11:53:57 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 6e0af83f0a59acb0366f130e458f1267c4554d56
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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))
;;;
- 10/36: HACK services: Add openssh-service as a Hurd service., (continued)
- 10/36: HACK services: Add openssh-service as a Hurd service., guix-commits, 2020/05/01
- 12/36: system: gnu: Populate "/etc" from "/boot/activation"., guix-commits, 2020/05/01
- 14/36: DRAFT: hurd: use static-networking instead of dummy loopback hack., guix-commits, 2020/05/01
- 01/36: services: Add hurd., guix-commits, 2020/05/01
- 13/36: system: hurd: Add openssh service., guix-commits, 2020/05/01
- 15/36: Revert "DRAFT: hurd: use static-networking instead of dummy loopback hack.", guix-commits, 2020/05/01
- 05/36: HACK services: Add guix-daemon-service as a Hurd service., guix-commits, 2020/05/01
- 07/36: HACK services: hurd: Add dummy loopback., guix-commits, 2020/05/01
- 16/36: system: hurd: Create system profile for guix development., guix-commits, 2020/05/01
- 17/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile., guix-commits, 2020/05/01
- 08/36: squash! Use static-networking for loopback,
guix-commits <=
- 24/36: services: hurd: Use hurd-file-systems-service., guix-commits, 2020/05/01
- 23/36: system: hurd: Export system variables., guix-commits, 2020/05/01
- 06/36: HACK services: hurd: Add dummy syslog., guix-commits, 2020/05/01
- 11/36: DRAFT system: hurd: Add the Shepherd., guix-commits, 2020/05/01
- 18/36: system: hurd: Add guix., guix-commits, 2020/05/01
- 21/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/05/01
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01
- 36/36: HACK Don't fail on running host's localedef., guix-commits, 2020/05/01