[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: linux-container: Remove networking service when network is shared
From: |
guix-commits |
Subject: |
01/01: linux-container: Remove networking service when network is shared with host. |
Date: |
Tue, 18 Jun 2019 14:56:17 -0400 (EDT) |
arunisaac pushed a commit to branch master
in repository guix.
commit b84c4cda046589658c4d1ba4a9c0b292351fe5ca
Author: Arun Isaac <address@hidden>
Date: Sat May 25 11:49:42 2019 +0530
linux-container: Remove networking service when network is shared with host.
* gnu/system/linux-container.scm (dummy-networking-service-type): New
variable.
(containerized-operating-system): If network is shared with host, replace
static-networking-service-type with dummy-networking-service-type.
---
gnu/system/linux-container.scm | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index c1e963d..61248c6 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -30,6 +30,7 @@
#:use-module (gnu build linux-container)
#:use-module (gnu services)
#:use-module (gnu services base)
+ #:use-module (gnu services shepherd)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:export (system-container
@@ -65,6 +66,16 @@ from OS that are needed on the bare metal and not in a
container."
files)))
base)))
+(define dummy-networking-service-type
+ (shepherd-service-type
+ 'dummy-networking
+ (const (shepherd-service
+ (documentation "Provide loopback and networking without actually
+doing anything.")
+ (provision '(loopback networking))
+ (start #~(const #t))))
+ #f))
+
(define* (containerized-operating-system os mappings
#:key
shared-network?
@@ -96,7 +107,8 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file
systems to add to OS."
agetty-service-type)
;; Remove nscd service if network is shared with the host.
(if shared-network?
- (list nscd-service-type)
+ (list nscd-service-type
+ static-networking-service-type)
(list))))
(operating-system
@@ -105,10 +117,17 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file
systems to add to OS."
(essential-services (container-essential-services
this-operating-system
#:shared-network? shared-network?))
- (services (remove (lambda (service)
- (memq (service-kind service)
- useless-services))
- (operating-system-user-services os)))
+ (services (append (remove (lambda (service)
+ (memq (service-kind service)
+ useless-services))
+ (operating-system-user-services os))
+ ;; Many Guix services depend on a 'networking' shepherd
+ ;; service, so make sure to provide a dummy 'networking'
+ ;; service when we are sure that networking is already
set up
+ ;; in the host and can be used. That prevents double
setup.
+ (if shared-network?
+ (list (service dummy-networking-service-type))
+ '())))
(file-systems (append (map mapping->fs
(if shared-network?
(append %network-file-mappings mappings)