From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container 1/2] restore: pass target vmid to config recovery
Date: Wed, 25 Nov 2020 15:07:49 +0100 [thread overview]
Message-ID: <20201125140750.2851534-1-f.gruenbichler@proxmox.com> (raw)
so that we get the correct warning prefix when the config contains bogus lines.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/PVE/API2/LXC.pm | 4 ++--
src/PVE/LXC/Create.pm | 19 +++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 9ecfb12..a263104 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -354,7 +354,7 @@ __PACKAGE__->register_method({
die "can't overwrite running container\n" if PVE::LXC::check_running($vmid);
if ($is_root && $archive ne '-') {
my $orig_conf;
- ($orig_conf, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive);
+ ($orig_conf, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive, $vmid);
$was_template = delete $orig_conf->{template};
# When we're root call 'restore_configuration' with restricted=0,
# causing it to restore the raw lxc entries, among which there may be
@@ -366,7 +366,7 @@ __PACKAGE__->register_method({
if ($storage_only_mode) {
if ($restore) {
if (!defined($orig_mp_param)) {
- (undef, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive);
+ (undef, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive, $vmid);
}
$mp_param = $orig_mp_param;
die "rootfs configuration could not be recovered, please check and specify manually!\n"
diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index 39902a2..d3939de 100644
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -173,22 +173,24 @@ sub restore_tar_archive {
}
sub recover_config {
- my ($storage_cfg, $volid) = @_;
+ my ($storage_cfg, $volid, $vmid) = @_;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
if (defined($storeid)) {
my $scfg = PVE::Storage::storage_check_enabled($storage_cfg, $storeid);
if ($scfg->{type} eq 'pbs') {
- return recover_config_from_proxmox_backup($storage_cfg, $volid);
+ return recover_config_from_proxmox_backup($storage_cfg, $volid, $vmid);
}
}
my $archive = PVE::Storage::abs_filesystem_path($storage_cfg, $volid);
- recover_config_from_tar($archive);
+ recover_config_from_tar($archive, $vmid);
}
sub recover_config_from_proxmox_backup {
- my ($storage_cfg, $volid) = @_;
+ my ($storage_cfg, $volid, $vmid) = @_;
+
+ $vmid //= 0;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid);
my $scfg = PVE::Storage::storage_config($storage_cfg, $storeid);
@@ -208,7 +210,7 @@ sub recover_config_from_proxmox_backup {
PVE::Storage::PBSPlugin::run_raw_client_cmd(
$scfg, $storeid, $cmd, $param, outfunc => $outfunc);
- my $conf = PVE::LXC::Config::parse_pct_config("/lxc/0.conf" , $raw);
+ my $conf = PVE::LXC::Config::parse_pct_config("/lxc/${vmid}.conf" , $raw);
delete $conf->{snapshots};
@@ -222,15 +224,16 @@ sub recover_config_from_proxmox_backup {
}
sub recover_config_from_tar {
- my ($archive) = @_;
+ my ($archive, $vmid) = @_;
my ($raw, $conf_file) = PVE::Storage::extract_vzdump_config_tar($archive, qr!(\./etc/vzdump/(pct|vps)\.conf)$!);
my $conf;
my $mp_param = {};
+ $vmid //= 0;
if ($conf_file =~ m/pct\.conf/) {
- $conf = PVE::LXC::Config::parse_pct_config("/lxc/0.conf" , $raw);
+ $conf = PVE::LXC::Config::parse_pct_config("/lxc/${vmid}.conf" , $raw);
delete $conf->{snapshots};
@@ -273,7 +276,7 @@ sub restore_configuration_from_proxmox_backup {
my ($vtype, $name, undef, undef, undef, undef, $format) =
PVE::Storage::parse_volname($storage_cfg, $archive);
- my $oldconf = recover_config_from_proxmox_backup($storage_cfg, $archive);
+ my $oldconf = recover_config_from_proxmox_backup($storage_cfg, $archive, $vmid);
sanitize_and_merge_config($conf, $oldconf, $restricted, $unique);
--
2.20.1
next reply other threads:[~2020-11-25 14:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 14:07 Fabian Grünbichler [this message]
2020-11-25 14:07 ` [pve-devel] [PATCH container 2/2] restore: add more informational messages Fabian Grünbichler
2021-01-26 17:53 ` [pve-devel] applied: " Thomas Lamprecht
2021-01-26 17:52 ` [pve-devel] applied: [PATCH container 1/2] restore: pass target vmid to config recovery 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=20201125140750.2851534-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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