napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] winnow floppy drives

Browse Source 
- don't list floppy drives

FIXES #1393
This commit is contained in:
Adriaan de Groot 2020-07-07 23:03:12 +02:00
parent a78c368367
commit 948c078e1a
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/partition/core/DeviceList.cpp
View File

@ -92,6 +92,19 @@ isIso9660( const Device* device )
return false; return false;
} }
static inline bool
isZRam( const Device* device )
{
const QString path = device->deviceNode();
return path.startswith( "/dev/zram" );
}
static inline bool
isFloppyDrive( const Device* device )
{
const QString path = device->deviceNode();
return path.startswith( "/dev/fd" ) || path.startswith( "/dev/floppy" );
}
static inline QDebug& static inline QDebug&
operator<<( QDebug& s, QList< Device* >::iterator& it ) operator<<( QDebug& s, QList< Device* >::iterator& it )
@ -138,11 +151,16 @@ getDevices( DeviceType which, qint64 minimumSize )
cDebug() << Logger::SubEntry << "Skipping nullptr device"; cDebug() << Logger::SubEntry << "Skipping nullptr device";
it = erase( devices, it ); it = erase( devices, it );
} }
else if ( ( *it )->deviceNode().startsWith( "/dev/zram" ) ) else if ( isZRam( *it ) )
{ {
cDebug() << Logger::SubEntry << "Removing zram" << it; cDebug() << Logger::SubEntry << "Removing zram" << it;
it = erase( devices, it ); it = erase( devices, it );
} }
else if ( isFloppyDrive( ( *it ) ) )
{
cDebug() << Logger::SubEntry << "Removing floppy disk" << it;
it = erase( devices, it );
}
else if ( writableOnly && hasRootPartition( *it ) ) else if ( writableOnly && hasRootPartition( *it ) )
{ {
cDebug() << Logger::SubEntry << "Removing device with root filesystem (/) on it" << it; cDebug() << Logger::SubEntry << "Removing device with root filesystem (/) on it" << it;