From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A690B9892 for ; Fri, 18 Nov 2022 10:36:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75D063642A for ; Fri, 18 Nov 2022 10:36:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 18 Nov 2022 10:36:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 47DEE44945 for ; Fri, 18 Nov 2022 10:36:43 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Fri, 18 Nov 2022 10:36:42 +0100 Message-Id: <20221118093642.46697-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.229 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [fedora.pm] Subject: [pve-devel] [PATCH container] enable systemd-networkd per preset in fedora 37+ X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Nov 2022 09:36:50 -0000 While the template has systemd-networkd enabled, the lack of /etc/machine-id causes systemd to revert to its "preset", where now in /usr/lib/systemd/system-preset/90-default.preset fedora disables systemd-networkd in favor of NetworkManager. Without this patch, the first boot of a fresh fedora 37 container would disable networking requiring a `systemctl enable systemd-networkd` from within the container once, after which it sticks around (until /etc/machine-id is deleted). This patch provides an `/etc/systemd/system-preset/00-pve.preset` file to keep systemd-networkd enabled via the `template_fixup` hook. Signed-off-by: Wolfgang Bumiller --- src/PVE/LXC/Setup/Fedora.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/PVE/LXC/Setup/Fedora.pm b/src/PVE/LXC/Setup/Fedora.pm index aad1eb4..021a44a 100644 --- a/src/PVE/LXC/Setup/Fedora.pm +++ b/src/PVE/LXC/Setup/Fedora.pm @@ -29,6 +29,18 @@ sub template_fixup { sub setup_init { my ($self, $conf) = @_; $self->setup_container_getty_service($conf); + + my $version = $self->{version}; + + if ($version >= 37) { + # systemd-networkd is disabled by the preset in >=37, reenable it + # this only affects the first-boot (if no /etc/machien-id exists). + $self->ct_mkdir('/etc/systemd/system-preset', 0755); + $self->ct_file_set_contents( + '/etc/systemd/system-preset/00-pve.preset', + "enable systemd-networkd.service\n", + ); + } } sub setup_network { -- 2.30.2