api2: disks: add mounted boolean field

... and remove '(mounted)' from usage string

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>

diff --git a/PVE/API2/Disks.pm b/PVE/API2/Disks.pm
index b6180572cdbd0cd54f14bba841ac51e16020948d..bde613286c9bf93a3b09f14b87c9bc73a804f1f6 100644 (file)
--- a/PVE/API2/Disks.pm
+++ b/PVE/API2/Disks.pm
@@ -125,6 +125,7 @@ __PACKAGE__->register_method ({
                },
                used => { type => 'string', optional => 1 },
                gpt => { type => 'boolean' },
+               mounted => { type => 'boolean' },
                size => { type => 'integer'},
                osdid => { type => 'integer'},
                vendor =>  { type => 'string', optional => 1 },

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index d67cc6b2ab255661afc8c5dd00f66e19a1db5cbc..253916b2fdb837fd9aab4bbd7854e1c77081237c 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -605,6 +605,7 @@ sub get_disks {
            size => $sysdata->{size},
            serial => $data->{serial},
            gpt => $data->{gpt},
+           mounted => exists $mounted->{$devpath},
            rpm => $data->{rpm},
            type =>  $type,
            wwn => $data->{wwn},
@@ -650,10 +651,7 @@ sub get_disks {
            }
 
            my $fstype = $info->{fstype};
-           if (defined($fstype)) {
-               return "${fstype} (mounted)" if $mounted->{$devpath};
-               return "${fstype}";
-           }
+           return "${fstype}" if defined($fstype);
            return 'mounted' if $mounted->{$devpath};
 
            return if !$is_partition;
@@ -693,6 +691,7 @@ sub get_disks {
 
            $partitions->{$part}->{devpath} = "$partpath/$part";
            $partitions->{$part}->{parent} = "$devpath";
+           $partitions->{$part}->{mounted} = exists $mounted->{"$partpath/$part"};
            $partitions->{$part}->{gpt} = $data->{gpt};
            $partitions->{$part}->{type} = 'partition';
            $partitions->{$part}->{size} =