proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-19 18:06:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: create: allow overriding non-disk options during restore

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-04-26 14:30:51 +02:00 committed by Thomas Lamprecht
parent 325b32cc40
commit 202a2a0bee
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/Qemu.pm
View File

@ -819,8 +819,11 @@ __PACKAGE__->register_method({
}
if ($archive) {
my $keystr = join(' ', keys %$param);
raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr;
for my $opt (sort keys $param->%*) {
if (PVE::QemuServer::Drive::is_valid_drivename($opt)) {
raise_param_exc({ $opt => "option conflicts with option 'archive'" });
}
}
if ($archive eq '-') {
die "pipe requires cli environment\n" if $rpcenv->{type} ne 'cli';
@ -876,6 +879,7 @@ __PACKAGE__->register_method({
unique => $unique,
bwlimit => $bwlimit,
live => $live_restore,
override_conf => $param,
};
if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') {
die "live-restore is only compatible with backup images from a Proxmox Backup Server\n"

26
PVE/QemuServer.pm
View File

@ -6482,6 +6482,17 @@ my $restore_destroy_volumes = sub {
}
};
my $restore_merge_config = sub {
my ($filename, $backup_conf_raw, $override_conf) = @_;
my $backup_conf = parse_vm_config($filename, $backup_conf_raw);
for my $key (keys $override_conf->%*) {
$backup_conf->{$key} = $override_conf->{$key};
}
return $backup_conf;
};
sub scan_volids {
my ($cfg, $vmid) = @_;
@ -6791,9 +6802,8 @@ sub restore_proxmox_backup_archive {
$new_conf_raw .= "\nlock: create";
}
PVE::Tools::file_set_contents($conffile, $new_conf_raw);
PVE::Cluster::cfs_update(); # make sure we read new file
my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $options->{override_conf});
PVE::QemuConfig->write_config($vmid, $new_conf);
eval { rescan($vmid, 1); };
warn $@ if $@;
@ -7097,9 +7107,8 @@ sub restore_vma_archive {
die $err;
}
PVE::Tools::file_set_contents($conffile, $new_conf_raw);
PVE::Cluster::cfs_update(); # make sure we read new file
my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $opts->{override_conf});
PVE::QemuConfig->write_config($vmid, $new_conf);
eval { rescan($vmid, 1); };
warn $@ if $@;
@ -7110,6 +7119,11 @@ sub restore_vma_archive {
sub restore_tar_archive {
my ($archive, $vmid, $user, $opts) = @_;
if (scalar(keys $opts->{override_conf}->%*) > 0) {
my $keystring = join(' ', keys $opts->{override_conf}->%*);
die "cannot pass along options ($keystring) when restoring from tar archive\n";
}
if ($archive ne '-') {
my $firstfile = tar_archive_read_firstfile($archive);
die "ERROR: file '$archive' does not look like a QemuServer vzdump backup\n"