From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id F40361FF17A for ; Fri, 4 Jul 2025 20:23:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 785DA3E1B7; Fri, 4 Jul 2025 20:24:17 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 20:23:36 +0200 Message-Id: <20250704182336.469274-3-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250704182336.469274-1-d.kral@proxmox.com> References: <20250704182336.469274-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.218 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 container v2 3/3] setup: skip rewriting ignored ssh host keys 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Skip rewriting any SSH host keys that are actively marked as ignored by the container template. This is done for consistency with remove_existing_ssh_host_keys(), which skips removing any ignored SSH host keys as well. Signed-off-by: Daniel Kral --- Because of the HA Rules stuff, I unfortunately didn't get the time to properly test these with any container images, but wanted to send them anyway. src/PVE/LXC/Setup.pm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm index 02aefc6..db5d181 100644 --- a/src/PVE/LXC/Setup.pm +++ b/src/PVE/LXC/Setup.pm @@ -276,12 +276,22 @@ sub rewrite_ssh_host_keys { my $keyfiles = []; for my $keytype (keys $keynames->%*) { my $basename = $keynames->{$keytype}; + my $private_basename = "/etc/ssh/$basename"; + my $public_basename = "/etc/ssh/$basename.pub"; + + if ( + $self->ct_is_file_ignored($private_basename) + || $self->ct_is_file_ignored($public_basename) + ) { + print "Skip generating SSH host key '$basename', because it is ignored.\n"; + next; + } + print "Creating SSH host key '$basename' - this may take some time ...\n"; my ($id, $private, $public) = generate_ssh_key($keytype, "root\@$hostname"); print "done: $id\n"; - push $keyfiles->@*, ["/etc/ssh/$basename", $private, 0600], - ["/etc/ssh/$basename.pub", $public, 0644]; + push $keyfiles->@*, [$private_basename, $private, 0600], [$public_basename, $public, 0644]; } $self->protected_call(sub { # write them now all to the CTs rootfs at once -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel