From: Elias Huhsovitz <e.huhsovitz@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Elias Huhsovitz <e.huhsovitz@proxmox.com>
Subject: [PATCH container v3 1/2] fix #7164: restore: apply password and ssh keys
Date: Fri, 31 Jul 2026 13:59:42 +0200 [thread overview]
Message-ID: <20260731115943.94756-2-e.huhsovitz@proxmox.com> (raw)
In-Reply-To: <20260731115943.94756-1-e.huhsovitz@proxmox.com>
When restoring a container with `pct restore`, the `--password` and
`--ssh-public-keys` options are silently ignored. Previously, the API
endpoint only invoked setup hooks during initial container creation or
cloning.
Introduce a new `post_restore_hook` in the LXC setup plugin
architecture. This hook applies the provided credentials if they are
defined.
Move `template_fixup` to the `post_restore_hook`, matching the creation
logic.
Signed-off-by: Elias Huhsovitz <e.huhsovitz@proxmox.com>
---
src/PVE/API2/LXC.pm | 2 +-
src/PVE/LXC/Setup.pm | 8 ++++++++
src/PVE/LXC/Setup/Base.pm | 9 +++++++++
src/PVE/LXC/Setup/Plugin.pm | 5 +++++
src/PVE/LXC/Setup/Unmanaged.pm | 4 ++++
5 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 22320ba..ad3b635 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -590,7 +590,7 @@ __PACKAGE__->register_method({
);
PVE::LXC::create_ifaces_ipams_ips($conf, $vmid) if $unique;
my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
- $lxc_setup->template_fixup($conf);
+ $lxc_setup->post_restore_hook($password, $ssh_keys);
} else {
my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); # detect OS
PVE::LXC::Config->write_config($vmid, $conf); # safe config (after OS detection)
diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm
index d936af2..f94919b 100644
--- a/src/PVE/LXC/Setup.pm
+++ b/src/PVE/LXC/Setup.pm
@@ -329,6 +329,14 @@ sub post_create_hook {
$self->check_systemd_nesting();
}
+sub post_restore_hook {
+ my ($self, $root_password, $ssh_keys) = @_;
+
+ $self->protected_call(sub {
+ $self->{plugin}->post_restore_hook($self->{conf}, $root_password, $ssh_keys);
+ });
+}
+
sub unified_cgroupv2_support {
my ($self) = @_;
diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm
index 567f9d6..bb75690 100644
--- a/src/PVE/LXC/Setup/Base.pm
+++ b/src/PVE/LXC/Setup/Base.pm
@@ -735,6 +735,15 @@ sub post_create_hook {
# fixme: what else ?
}
+sub post_restore_hook {
+ my ($self, $conf, $root_password, $ssh_keys) = @_;
+
+ $self->template_fixup($conf);
+
+ $self->set_user_password($conf, 'root', $root_password) if defined($root_password);
+ $self->set_user_authorized_ssh_keys($conf, 'root', $ssh_keys) if $ssh_keys;
+}
+
# File access wrappers for container setup code.
# NOTE: those are not direct part of the Plugin API (yet), avoid using them outside the child plugins
# For user-namespace support these might need to take uid and gid maps into account.
diff --git a/src/PVE/LXC/Setup/Plugin.pm b/src/PVE/LXC/Setup/Plugin.pm
index 95a633f..6ba656b 100644
--- a/src/PVE/LXC/Setup/Plugin.pm
+++ b/src/PVE/LXC/Setup/Plugin.pm
@@ -99,4 +99,9 @@ sub post_create_hook {
croak "implement me in sub-class";
}
+sub post_restore_hook {
+ my ($self, $conf, $root_password, $ssh_keys) = @_;
+ croak "implement me in sub-class";
+}
+
1;
diff --git a/src/PVE/LXC/Setup/Unmanaged.pm b/src/PVE/LXC/Setup/Unmanaged.pm
index b51be55..0b440cf 100644
--- a/src/PVE/LXC/Setup/Unmanaged.pm
+++ b/src/PVE/LXC/Setup/Unmanaged.pm
@@ -84,4 +84,8 @@ sub post_create_hook {
my ($self, $conf, $root_password, $ssh_keys) = @_;
}
+sub post_restore_hook {
+ my ($self, $conf, $root_password, $ssh_keys) = @_;
+}
+
1;
--
2.47.3
next prev parent reply other threads:[~2026-07-31 11:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 11:59 [PATCH container v3 0/2] fix #7164: restore: apply password and ssh keys Elias Huhsovitz
2026-07-31 11:59 ` Elias Huhsovitz [this message]
2026-07-31 11:59 ` [PATCH container v3 2/2] restore: check systemd nesting Elias Huhsovitz
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=20260731115943.94756-2-e.huhsovitz@proxmox.com \
--to=e.huhsovitz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.