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

move directory test into get_sysdir_info

Browse Source 
because it logically belongs there, also
this makes the testing easier

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2016-10-17 10:29:09 +02:00
committed by Dietmar Maurer
parent 532e89e7be
commit 461a9fd8da
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Diskmanage.pm
View File

@ -266,6 +266,8 @@ sub get_udev_info {
sub get_sysdir_info { sub get_sysdir_info {
my ($sysdir) = @_; my ($sysdir) = @_;
return undef if ! -d "$sysdir/device";
my $data = {}; my $data = {};
my $size = file_read_firstline("$sysdir/size"); my $size = file_read_firstline("$sysdir/size");
@ -381,10 +383,8 @@ sub get_disks {
my $sysdir = "/sys/block/$dev"; my $sysdir = "/sys/block/$dev";
return if ! -d "$sysdir/device";
# we do not want iscsi devices # we do not want iscsi devices
return if readlink($sysdir) =~ m|host[^/]*/session[^/]*|; return if -l $sysdir && readlink($sysdir) =~ m|host[^/]*/session[^/]*|;
my $sysdata = get_sysdir_info($sysdir); my $sysdata = get_sysdir_info($sysdir);
return if !defined($sysdata); return if !defined($sysdata);