Hi Arun and Bruno, Arun Isaac <arunis...@systemreboot.net> writes:
>> I'm inclined to keep it in %network-configuration-files just to be >> safe. > > I agree. I don't really understand the implications of removing > /etc/hosts from %network-configuration-files. I would err on the side of > caution and leave it there for now. That sounds very sensible. > > @Pierre: Could you make a patch of the fix you suggested earlier > (removing hosts-service-type when the --network flag is provided) and > push it? Thank you! Sounds good! Just testing the following patch and will push it in a minute.
signature.asc
Description: PGP signature
>From 42fbe62d52a82d1003c3d7039d3c4a46806c5cee Mon Sep 17 00:00:00 2001 Message-Id: <42fbe62d52a82d1003c3d7039d3c4a46806c5cee.1679836531.git.pierre.langl...@gmx.com> From: Pierre Langlois <pierre.langl...@gmx.com> Date: Sun, 26 Mar 2023 13:55:14 +0100 Subject: [PATCH] linux-container: Remove hosts-service-type when network is shared. 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. --- gnu/system/linux-container.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index c2fd55d48e..409386a84f 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2020 Google LLC ;;; Copyright © 2022 Ricardo Wurmus <rek...@elephly.net> +;;; Copyright © 2023 Pierre Langlois <pierre.langl...@gmx.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,9 +50,12 @@ (define* (container-essential-services os #:key shared-network?) (define base (remove (lambda (service) (memq (service-kind service) - (list (service-kind %linux-bare-metal-service) - firmware-service-type - system-service-type))) + (cons* (service-kind %linux-bare-metal-service) + firmware-service-type + system-service-type + (if shared-network? + (list hosts-service-type) + '())))) (operating-system-default-essential-services os))) (cons (service system-service-type -- 2.39.2
Thanks, Pierre
