Use set_lock and remove_lock

instead of manually setting and removing the lock config
parameter.

diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index 4376f8a8ae756cb0706121fa92c980c7a30333d4..963015bc25638d185860d89b6e9e9efbd937c030 100755 (executable)
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -48,11 +48,7 @@ __PACKAGE__->register_method ({
 
        my $vmid = $param->{vmid};
 
-       PVE::LXC::Config->lock_config($vmid, sub {
-           my $conf = PVE::LXC::Config->load_config($vmid);
-           delete $conf->{lock};
-           PVE::LXC::Config->write_config($vmid, $conf);
-       });
+       PVE::LXC::Config->remove_lock($vmid);
 
        return undef;
     }});

diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 33a0b55d54d925f865c4bc3908deb6d39820847d..1bad3fd73a8f3991dc58f586b45d7a991376c685 100644 (file)
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -174,35 +174,13 @@ sub prepare {
 sub lock_vm {
     my ($self, $vmid) = @_;
 
-    my $lockconfig = sub {
-       my ($self, $vmid) = @_;
-
-       my $conf = PVE::LXC::Config->load_config($vmid);
-
-       PVE::LXC::Config->check_lock($conf);
-       $conf->{lock} = 'backup';
-
-       PVE::LXC::Config->write_config($vmid, $conf);
-    };
-
-    PVE::LXC::Config->lock_config($vmid, $lockconfig, ($self, $vmid));
+    PVE::LXC::Config->set_lock($vmid, 'backup');
 }
 
 sub unlock_vm {
     my ($self, $vmid) = @_;
 
-    my $unlockconfig = sub {
-       my ($self, $vmid) = @_;
-
-       my $conf = PVE::LXC::Config->load_config($vmid);
-
-       if ($conf->{lock} && $conf->{lock} eq 'backup') {
-           delete $conf->{lock};
-           PVE::LXC::Config->write_config($vmid, $conf);
-       }
-    };
-
-    PVE::LXC::Config->lock_config($vmid, $unlockconfig, ($self, $vmid));
+    PVE::LXC::Config->remove_lock($vmid, 'backup')
 }
 
 sub snapshot {