correctly set and remove lock

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 1a6ce746f8d57c41c0aeecea510c56f25ca3644a..9847254b538764eaaf4d5171d04e5f71cd87bcb4 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3755,6 +3755,7 @@ sub set_migration_caps {
 }
 
 my $fast_plug_option = {
+    'lock' => 1,
     'name' => 1,
     'onboot' => 1, 
     'shares' => 1,

diff --git a/qm b/qm
index 249117c9d1ab0da5626da77f34555f9aed978145..b6617230a6d767cc95cc424d8ffd75d096400aa7 100755 (executable)
--- a/qm
+++ b/qm
@@ -198,6 +198,7 @@ __PACKAGE__->register_method ({
        PVE::QemuServer::lock_config ($vmid, sub {
            my $conf = PVE::QemuServer::load_config($vmid);
            delete $conf->{lock};
+           delete $conf->{pending}->{lock} if $conf->{pending}; # just to be sure
            PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
        });