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 B7BEB71878 for ; Mon, 4 Oct 2021 16:57:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC7F71DBE7 for ; Mon, 4 Oct 2021 16:57:07 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8E68A1DBDC for ; Mon, 4 Oct 2021 16:57:06 +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 656D9454F7 for ; Mon, 4 Oct 2021 16:57:06 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Mon, 4 Oct 2021 16:55:14 +0200 Message-Id: <20211004145513.2141283-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.106 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 container] fix creating unmanaged 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: Mon, 04 Oct 2021 14:57:07 -0000 $keynames was not a hash reference since nothing was returned by ssh_host_key_types_to_generate for unmanaged containers, this causes the post_create_hook to fail and no container is created. fix by returning an empty hash so that $keynames can be a hashref and processed accordingly. also dropped a remaining unmanaged return (should have no effect anymore anyways, since $self->{plugin} is now set to 'unmanaged' instead of empty) --- note that we can still allow generating ssh keys for unmanaged containers, i have another patch like that (i can send if you wish), which doesn't skip creating ssh keys -- however for that to work we need to use functions from PVE::Tools (so that we can have ct_file_exists and friends) src/PVE/LXC/Setup.pm | 2 -- src/PVE/LXC/Setup/Unmanaged.pm | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm index cfbe02c..4e211ef 100644 --- a/src/PVE/LXC/Setup.pm +++ b/src/PVE/LXC/Setup.pm @@ -228,8 +228,6 @@ my sub generate_ssh_key { # create temporary key in hosts' /run, then read and u sub rewrite_ssh_host_keys { my ($self) = @_; - return if !$self->{plugin}; # unmanaged - my $plugin = $self->{plugin}; my $keynames = $plugin->ssh_host_key_types_to_generate(); diff --git a/src/PVE/LXC/Setup/Unmanaged.pm b/src/PVE/LXC/Setup/Unmanaged.pm index 38e245f..2ca2898 100644 --- a/src/PVE/LXC/Setup/Unmanaged.pm +++ b/src/PVE/LXC/Setup/Unmanaged.pm @@ -51,6 +51,7 @@ sub unified_cgroupv2_support { sub ssh_host_key_types_to_generate { my ($self) = @_; + return {}; } # hooks -- 2.30.2