yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diskmanage: collect partitions in hash

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2021-01-26 12:45:22 +01:00
committed by Thomas Lamprecht
parent 40be5c5cab
commit 89c27ea8ab
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Diskmanage.pm
View File

@ -614,7 +614,6 @@ sub get_disks {
my $db_count = 0;
my $wal_count = 0;
my $found_partitions;
my $found_lvm;
my $found_mountpoints;
my $found_zfs;
@ -626,10 +625,15 @@ sub get_disks {
# e.g. from /dev/cciss/c0d0 get /dev/cciss
$partpath =~ s/\/[^\/]+$//;
my $partitions = {};
dir_glob_foreach("$sysdir", "$dev.+", sub {
my ($part) = @_;
$found_partitions = 1;
$partitions->{$part}->{devpath} = "$partpath/$part";
$partitions->{$part}->{gpt} = $data->{gpt};
$partitions->{$part}->{size} =
get_sysdir_size("$sysdir/$part") // 0;
if (my $mp = $mounted->{"$partpath/$part"}) {
$found_mountpoints = 1;
@ -673,7 +677,7 @@ sub get_disks {
$used = 'LVM' if $found_lvm && !$used;
$used = 'ZFS' if $found_zfs && !$used;
$used = 'Device Mapper' if $found_dm && !$used;
$used = 'partitions' if $found_partitions && !$used;
$used = 'partitions' if scalar(keys %{$partitions}) && !$used;
# multipath, software raid, etc.
# this check comes in last, to show more specific info