[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/36: Revert "squash! Use static-networking for loopback"
From: |
guix-commits |
Subject: |
09/36: Revert "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 7f42911f5e95d3ebc66ba243b2a69542074c3bb7
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri May 1 17:04:39 2020 +0200
Revert "squash! Use static-networking for loopback"
This does not work yet...
herd: exeception caught while executing 'start' on service 'loopback':
Value out of range 0 to 4294967295: -1
This reverts commit 9d03f1e8cee163048ecadd16a1c74612c17e98c2.
---
gnu/services/hurd.scm | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 2f4b177..3686987 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -30,6 +30,7 @@
#: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))
@@ -48,7 +49,7 @@
(($ <hurd-console-configuration>) (hurd-console-shepherd-service config))
(($ <hurd-ttys-configuration>) (hurd-ttys-shepherd-service config))
(($ <syslog-configuration>) (syslog-shepherd-service config))
- ((($ <static-networking>)) (map static-networking-shepherd-service
config))
+ (('loopback) (hurd-loopback-shepherd-service #f))
(('user-processes) (user-processes-shepherd-service '()))
(_ '()))))
@@ -127,14 +128,30 @@
;;;
-;;; Bridge for static-networking service.
+;;; Dummy hurd-loopback service, required for guix-daemon.
;;;
-(define <static-networking>
- (@@ (gnu services base) <static-networking>))
+(define (hurd-loopback-shepherd-service _)
+ "Return the 'loopback' Shepherd service."
-(define static-networking-shepherd-service
- (@@ (gnu services base) static-networking-shepherd-service))
+ (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.")))
;;;
- branch wip-hurd-vm created (now 3c8947d), guix-commits, 2020/05/01
- 02/36: DRAFT services: Add hurd-console-service-type., guix-commits, 2020/05/01
- 04/36: HACK services: Add user-processes-service as a Hurd service., guix-commits, 2020/05/01
- 03/36: DRAFT services: Add hurd-ttys-service-type., guix-commits, 2020/05/01
- 09/36: Revert "squash! Use static-networking for loopback",
guix-commits <=
- 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