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

remove usb scan code

Browse Source 
this is now in PVE::SysFSTools

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2018-11-16 16:17:59 +01:00
committed by Thomas Lamprecht
parent a0965edde7
commit 98bf79f78b
1 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
PVE/Storage.pm
View File

@ -1229,62 +1229,6 @@ sub resolv_portal {
raise_param_exc({ portal => "unable to resolve portal address '$portal'" });
}
# idea is from usbutils package (/usr/bin/usb-devices) script
sub __scan_usb_device {
my ($res, $devpath, $parent, $level) = @_;
return if ! -d $devpath;
return if $level && $devpath !~ m/^.*[-.](\d+)$/;
my $port = $level ? int($1 - 1) : 0;
my $busnum = int(file_read_firstline("$devpath/busnum"));
my $devnum = int(file_read_firstline("$devpath/devnum"));
my $d = {
port => $port,
level => $level,
busnum => $busnum,
devnum => $devnum,
speed => file_read_firstline("$devpath/speed"),
class => hex(file_read_firstline("$devpath/bDeviceClass")),
vendid => file_read_firstline("$devpath/idVendor"),
prodid => file_read_firstline("$devpath/idProduct"),
};
if ($level) {
my $usbpath = $devpath;
$usbpath =~ s|^.*/\d+\-||;
$d->{usbpath} = $usbpath;
}
my $product = file_read_firstline("$devpath/product");
$d->{product} = $product if $product;
my $manu = file_read_firstline("$devpath/manufacturer");
$d->{manufacturer} = $manu if $manu;
my $serial => file_read_firstline("$devpath/serial");
$d->{serial} = $serial if $serial;
push @$res, $d;
foreach my $subdev (<$devpath/$busnum-*>) {
next if $subdev !~ m|/$busnum-[0-9]+(\.[0-9]+)*$|;
__scan_usb_device($res, $subdev, $devnum, $level + 1);
}
};
sub scan_usb {
my $devlist = [];
foreach my $device (</sys/bus/usb/devices/usb*>) {
__scan_usb_device($devlist, $device, 0, 0);
}
return $devlist;
}
sub scan_iscsi {
my ($portal_in) = @_;