mirror of
https://git.proxmox.com/git/qemu-server
synced 2025-05-29 20:58:54 +00:00
api: restore: start and live-restore do not conflict
if live-restore is set then the VM is actually started before, so we can just skip it.. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
a183df68a5
commit
a0e27afb5e
@ -575,9 +575,6 @@ __PACKAGE__->register_method({
|
|||||||
my $unique = extract_param($param, 'unique');
|
my $unique = extract_param($param, 'unique');
|
||||||
my $live_restore = extract_param($param, 'live-restore');
|
my $live_restore = extract_param($param, 'live-restore');
|
||||||
|
|
||||||
raise_param_exc({ 'start' => "cannot specify 'start' with 'live-restore'" })
|
|
||||||
if $start_after_create && $live_restore;
|
|
||||||
|
|
||||||
if (defined(my $ssh_keys = $param->{sshkeys})) {
|
if (defined(my $ssh_keys = $param->{sshkeys})) {
|
||||||
$ssh_keys = URI::Escape::uri_unescape($ssh_keys);
|
$ssh_keys = URI::Escape::uri_unescape($ssh_keys);
|
||||||
PVE::Tools::validate_ssh_public_keys($ssh_keys);
|
PVE::Tools::validate_ssh_public_keys($ssh_keys);
|
||||||
@ -686,7 +683,7 @@ __PACKAGE__->register_method({
|
|||||||
|
|
||||||
PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
|
PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
|
||||||
|
|
||||||
if ($start_after_create) {
|
if ($start_after_create && !$live_restore) {
|
||||||
print "Execute autostart\n";
|
print "Execute autostart\n";
|
||||||
eval { PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) };
|
eval { PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) };
|
||||||
warn $@ if $@;
|
warn $@ if $@;
|
||||||
|
Loading…
Reference in New Issue
Block a user