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 2D29072F58 for ; Wed, 26 May 2021 16:19:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F382134CE 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 C316E134B7 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 14QEIo8F1451540; Wed, 26 May 2021 16:18:50 +0200 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 14QEIoOk1451539; Wed, 26 May 2021 16:18:50 +0200 From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 26 May 2021 16:18:39 +0200 Message-Id: <20210526141840.1450325-2-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.198 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 container 1/2] setup: clear /etc/machine-id for newly created containers 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:19:28 -0000 this way when new containers are created they will have a unique /etc/machine-id Signed-off-by: Oguz Bektas --- v1->v2: * incorporated thomas' suggestions src/PVE/LXC/Setup.pm | 10 ++++++++++ src/PVE/LXC/Setup/Base.pm | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm index 8b8fee9..c31a164 100644 --- a/src/PVE/LXC/Setup.pm +++ b/src/PVE/LXC/Setup.pm @@ -352,6 +352,16 @@ sub pre_start_hook { $self->protected_call($code); } +sub clear_machine_id { + my ($self, $conf, $clone) = @_; + + my $code = sub { + $self->{plugin}->clear_machine_id($self->{conf}, $clone); + }; + $self->protected_call($code); + +} + sub post_create_hook { my ($self, $root_password, $ssh_keys) = @_; diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm index d73335b..21074b7 100644 --- a/src/PVE/LXC/Setup/Base.pm +++ b/src/PVE/LXC/Setup/Base.pm @@ -476,6 +476,30 @@ sub set_timezone { } } +sub clear_machine_id { + my ($self, $conf, $clone) = @_; + + my $uses_systemd = $self->ct_is_executable("/lib/systemd/systemd") + || $self->ct_is_executable("/usr/lib/systemd/systemd"); + + 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_is_symlink($dbus_machine_id_path) + && $uses_systemd + ) { + $self->ct_unlink($dbus_machine_id_path); + } + + # don't remove file if container is being cloned + if ($clone) { + $self->ct_file_set_contents($machine_id_path, "\n"); + } else { + $self->ct_unlink($machine_id_path); + } +} + sub pre_start_hook { my ($self, $conf) = @_; @@ -491,6 +515,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); &$randomize_crontab($self, $conf); -- 2.20.1