]> git.proxmox.com Git - pve-cluster.git/commitdiff
write_datacenter_config: do not overwrite new migration option with old value
authorDietmar Maurer <dietmar@proxmox.com>
Thu, 3 Nov 2016 07:37:32 +0000 (08:37 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 3 Nov 2016 07:37:32 +0000 (08:37 +0100)
Just to be sure.

data/PVE/Cluster.pm

index f8a3729381bc77f6ffc6367b76795a80d6ed0093..da8dab48ca8369c43ff3475230e35eb8448a3e33 100644 (file)
@@ -1438,7 +1438,7 @@ sub write_datacenter_config {
     my ($filename, $cfg) = @_;
 
     # map deprecated setting to new one
-    if (defined($cfg->{migration_unsecure})) {
+    if (defined($cfg->{migration_unsecure}) && !defined($cfg->{migration})) {
        my $migration_unsecure = delete $cfg->{migration_unsecure};
        $cfg->{migration}->{type} = ($migration_unsecure) ? 'insecure' : 'secure';
     }