only activate lvm volumes on local node

[pve-storage.git] / PVE / Storage.pm

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 5fe6c95f1753a15bdc5739a5e21fa90a5ac5f7bf..f56a0d1920eaa4b823108cce7a8452cda90c9ee1 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -425,15 +425,13 @@ sub parse_config {
 
     my $ids = {};
 
-    my $sha1 = Digest::SHA1->new;
+    my $digest = Digest::SHA1::sha1_hex(defined($raw) ? $raw : '');
 
     my $pri = 0;
 
     while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
        my $line = $1;
 
-       $sha1->add ($line); # compute digest
-
        next if $line =~ m/^\#/;
        next if $line =~ m/^\s*$/;
 
@@ -526,8 +524,6 @@ sub parse_config {
        }
     }
 
-    my $digest = $sha1->hexdigest;
-
     my $cfg = { ids => $ids, digest => $digest};
 
     return $cfg;
@@ -1289,7 +1285,7 @@ sub vdisk_alloc {
            die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
                if !$name;
 
-           my $cmd = ['/sbin/lvcreate', '--addtag', "pve-vm-$vmid", '--size', "${size}k", '--name', $name, $vg];
+           my $cmd = ['/sbin/lvcreate', '-aly', '--addtag', "pve-vm-$vmid", '--size', "${size}k", '--name', $name, $vg];
 
            run_command ($cmd);
 
@@ -2061,6 +2057,7 @@ sub storage_info {
            total => 0, 
            avail => 0, 
            used => 0, 
+           shared => $ids->{$storeid}->{shared} ? 1 : 0,
            content => content_hash_to_string($ids->{$storeid}->{content}),
            active => 0,
        };