From: Oguz Bektas <o.bektas@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container] fix creating unmanaged containers
Date: Mon, 4 Oct 2021 16:55:14 +0200 [thread overview]
Message-ID: <20211004145513.2141283-1-o.bektas@proxmox.com> (raw)
$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
next reply other threads:[~2021-10-04 14:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 14:55 Oguz Bektas [this message]
2021-10-05 4:17 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211004145513.2141283-1-o.bektas@proxmox.com \
--to=o.bektas@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox