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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B864C72F6E for ; Thu, 17 Jun 2021 12:52:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A76DB1A7D6 for ; Thu, 17 Jun 2021 12:52:11 +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 id 8C6F61A7BE for ; Thu, 17 Jun 2021 12:52:10 +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 66A27441AB for ; Thu, 17 Jun 2021 12:52:10 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Thu, 17 Jun 2021 12:51:58 +0200 Message-Id: <20210617105201.804786-2-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210617105201.804786-1-o.bektas@proxmox.com> References: <20210617105201.804786-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.789 Adjusted score from AWL reputation of From: address 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 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] [PATCH v5 container 1/4] setup: add post_clone_hook for 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: Thu, 17 Jun 2021 10:52:11 -0000 for now it calls the new clear_machine_id function. this way when new containers are created they will have a unique /etc/machine-id. Signed-off-by: Oguz Bektas --- v4->v5: * no change src/PVE/LXC/Setup.pm | 12 ++++++++++++ src/PVE/LXC/Setup/Base.pm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm index 8b8fee9..bcb995d 100644 --- a/src/PVE/LXC/Setup.pm +++ b/src/PVE/LXC/Setup.pm @@ -352,6 +352,18 @@ sub pre_start_hook { $self->protected_call($code); } +sub post_clone_hook { + my ($self, $conf) = @_; + + my $clone = 1; + + my $code = sub { + $self->{plugin}->post_clone_hook($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..54cb9a8 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) = @_; @@ -488,9 +512,16 @@ sub pre_start_hook { # fixme: what else ? } +sub post_clone_hook { + my ($self, $conf) = @_; + + $self->clear_machine_id($conf, 1); +} + 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