Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: bring back UdevQt::Device::alternateDeviceSymlinks() to use it in storage access

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-12 13:45:42 +03:00
parent de3b483cc3
commit 495599a241
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
solid/solid/backends/shared/udevqt.h
View file

@ -47,6 +47,7 @@ class Device
int sysfsNumber() const;
QString driver() const;
QString primaryDeviceFile() const;
QStringList alternateDeviceSymlinks() const;
QStringList deviceProperties() const;
Device parent() const;

8
solid/solid/backends/shared/udevqtdevice.cpp
View file

@ -151,6 +151,14 @@ QString Device::primaryDeviceFile() const
return QString::fromLatin1(udev_device_get_devnode(d->udev));
}
QStringList Device::alternateDeviceSymlinks() const
{
if (!d)
return QStringList();
return listFromListEntry(udev_device_get_devlinks_list_entry(d->udev));
}
QStringList Device::deviceProperties() const
{
if (!d)

2
solid/solid/backends/udev/udevstorageaccess.cpp
View file

@ -62,7 +62,7 @@ QString StorageAccess::filePath() const
}
}
const QStringList devlinks = m_device->property("DEVLINKS").toString().split(" ");
const QStringList devlinks = m_device->udevDevice().alternateDeviceSymlinks();
foreach (const QString &link, devlinks) {
foreach (const KMountPoint::Ptr mountpoint, mountpoints) {
if (mountpoint->mountedFrom() == link || mountpoint->realDeviceName() == link) {