futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-container: Remove hosts-service-type when network is shared.

Browse Source 
Fixes <https://issues.guix.gnu.org/61627>.

* gnu/system/linux-container.scm (container-essential-services): When
shared-network? is true, remove the hosts-service-type service kind.
This commit is contained in:
Pierre Langlois 2023-03-26 13:55:14 +01:00
parent 36b22aa75a
commit 42fbe62d52
No known key found for this signature in database
GPG Key ID: A8FC9E447F4F7D54
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/system/linux-container.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Google LLC ;;; Copyright © 2020 Google LLC
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2023 Pierre Langlois <pierre.langlois@gmx.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -49,9 +50,12 @@ from OS that are needed on the bare metal and not in a container."
(define base (define base
(remove (lambda (service) (remove (lambda (service)
(memq (service-kind service) (memq (service-kind service)
(list (service-kind %linux-bare-metal-service) (cons* (service-kind %linux-bare-metal-service)
firmware-service-type firmware-service-type
system-service-type))) system-service-type
(if shared-network?
(list hosts-service-type)
'()))))
(operating-system-default-essential-services os))) (operating-system-default-essential-services os)))
(cons (service system-service-type (cons (service system-service-type