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 B9CB472471 for ; Tue, 25 May 2021 15:17:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B65F62C505 for ; Tue, 25 May 2021 15:17:14 +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 A3F7E2C4F9 for ; Tue, 25 May 2021 15:17:12 +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 14PDHCZp1010365; Tue, 25 May 2021 15:17:12 +0200 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 14PDHC9n1010363; Tue, 25 May 2021 15:17:12 +0200 From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Tue, 25 May 2021 15:17:11 +0200 Message-Id: <20210525131711.1007675-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 2 AWL -0.135 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [base.pm] Subject: [pve-devel] [PATCH container] fix #3443: setup: clear /etc/machine-id in post-create hook 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: Tue, 25 May 2021 13:17:14 -0000 this way when new containers are created the will have a unique /etc/machine-id note that post_create_hook doesn't run for cloned containers so that will need to be handled separately Signed-off-by: Oguz Bektas --- src/PVE/LXC/Setup/Base.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm index be41874..75a7f74 100644 --- a/src/PVE/LXC/Setup/Base.pm +++ b/src/PVE/LXC/Setup/Base.pm @@ -476,6 +476,18 @@ sub set_timezone { } } +sub clear_machine_id { + my ($self, $conf) = @_; + + my $dbus_machine_id_path = "/var/lib/dbus/machine-id"; + my $machine_id_path = "/etc/machine-id"; + if ($self->ct_file_exists($dbus_machine_id_path)) { + $self->ct_unlink($dbus_machine_id_path); + } + $self->ct_unlink($machine_id_path); + $self->ct_file_set_contents($machine_id_path, "uninitialized\n"); +} + sub pre_start_hook { my ($self, $conf) = @_; @@ -491,6 +503,7 @@ sub pre_start_hook { sub post_create_hook { my ($self, $conf, $root_password, $ssh_keys) = @_; + $self->clear_machine_id($conf); $self->template_fixup($conf); $self->randomize_crontab($conf); -- 2.20.1