diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2019-05-25 11:49:42 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2019-06-19 00:19:47 +0530 |
| commit | b84c4cda046589658c4d1ba4a9c0b292351fe5ca (patch) | |
| tree | fb98916e5e63d5ce71d4c40dc89135206583b819 /gnu/system | |
| parent | cb13618b6d2293e39ab4722d541dd8720e4d1812 (diff) | |
| download | guix-b84c4cda046589658c4d1ba4a9c0b292351fe5ca.tar.gz | |
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.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-container.scm | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index c1e963d047..61248c62b9 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) |