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 2994072F3E for ; Wed, 26 May 2021 16:18:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 185C6134CD for ; Wed, 26 May 2021 16:18:58 +0200 (CEST) Received: from gaia.proxmox.com (unknown [94.136.29.99]) (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 id CA2F2134BC for ; Wed, 26 May 2021 16:18:56 +0200 (CEST) Received: from gaia.proxmox.com (localhost.localdomain [127.0.0.1]) by gaia.proxmox.com (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 14QEIoTq1451544; Wed, 26 May 2021 16:18:50 +0200 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 14QEIoa71451543; Wed, 26 May 2021 16:18:50 +0200 From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 26 May 2021 16:18:40 +0200 Message-Id: <20210526141840.1450325-3-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210526141840.1450325-1-o.bektas@proxmox.com> References: <20210526141840.1450325-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 2 AWL -0.202 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v2 container 2/2] clear /etc/machine-id also after container clone 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: Wed, 26 May 2021 14:18:58 -0000 pass $clone=1 to avoid removing the file. instead we truncate it to an empty file Signed-off-by: Oguz Bektas --- src/PVE/API2/LXC.pm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index a9ea3a6..413f466 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -1594,7 +1594,24 @@ __PACKAGE__->register_method({ }; PVE::Firewall::clone_vmfw_conf($vmid, $newid); - return $rpcenv->fork_worker('vzclone', $vmid, $authuser, $realcmd); + + my $task = eval { + return $rpcenv->fork_worker('vzclone', $vmid, $authuser, $realcmd); + }; + if (my $err = $@) { + warn $@ if $@; + die $err; + } + + my $lastconf = PVE::LXC::Config->load_config($newid); + my $rootdir = PVE::LXC::mount_all($newid, $storecfg, $lastconf, 1); + my $lxc_setup = PVE::LXC::Setup->new($lastconf, $rootdir); + $lxc_setup->clear_machine_id($lastconf, 1); + PVE::LXC::umount_all($newid, $storecfg, $lastconf, 1); + + return $task; + + }}); -- 2.20.1