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 A23739D8F5 for ; Fri, 27 Oct 2023 13:20:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B1C6387F9 for ; Fri, 27 Oct 2023 13:20:53 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 27 Oct 2023 13:20:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 72F7342522; Fri, 27 Oct 2023 13:20:52 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 27 Oct 2023 13:20:20 +0200 Message-ID: <20231027112022.1960451-5-s.lendl@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231027112022.1960451-1-s.lendl@proxmox.com> References: <87v8axbjh1.fsf@gmail.com> <20231027112022.1960451-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC pve-network] do not remove DHCP mapping on stop 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, 27 Oct 2023 11:20:53 -0000 Signed-off-by: Stefan Lendl --- src/PVE/LXC.pm | 8 -------- src/lxc-pve-poststop-hook | 1 - 2 files changed, 9 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index bd8eb63..a7de9b8 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -916,14 +916,6 @@ sub vm_stop_cleanup { eval { my $vollist = PVE::LXC::Config->get_vm_volumes($conf); PVE::Storage::deactivate_volumes($storage_cfg, $vollist); - - for my $k (keys %$conf) { - next if $k !~ /^net(\d+)/; - my $net = PVE::LXC::Config->parse_lxc_network($conf->{$k}); - next if $net->{type} ne 'veth'; - - PVE::Network::SDN::Dhcp::remove_mapping($net->{bridge}, $net->{hwaddr}); - } }; warn $@ if $@; # avoid errors - just warn } diff --git a/src/lxc-pve-poststop-hook b/src/lxc-pve-poststop-hook index e7d46c7..2fe97ec 100755 --- a/src/lxc-pve-poststop-hook +++ b/src/lxc-pve-poststop-hook @@ -12,7 +12,6 @@ use PVE::LXC::Config; use PVE::LXC::Tools; use PVE::LXC; use PVE::Network; -use PVE::Network::SDN::Dhcp; use PVE::RESTEnvironment; use PVE::Storage; use PVE::Tools; -- 2.41.0