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

[partition] Improve logging in ClearMountsJob

Browse Source 
- mark internal bits as static
- explain what is being looked-for

SEE #1817
SEE #1564
This commit is contained in:
Adriaan de Groot 2021-11-01 16:31:07 +01:00
parent 3f8078ea0f
commit 3e58639a68
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -29,28 +29,19 @@
using CalamaresUtils::Partition::PartitionIterator;
ClearMountsJob::ClearMountsJob( Device* device )
: Calamares::Job()
, m_device( device )
{
}
QString
ClearMountsJob::prettyName() const
{
return tr( "Clear mounts for partitioning operations on %1" ).arg( m_device->deviceNode() );
}
QString
ClearMountsJob::prettyStatusMessage() const
{
return tr( "Clearing mounts for partitioning operations on %1." ).arg( m_device->deviceNode() );
}
QStringList
/** @brief Returns list of partitions on a given @p deviceName
*
* The @p deviceName is a (whole-block) device, like "sda", and the partitions
* returned are then "sdaX". The whole-block device itself is ignored, if
* present.
*
* The format for /etc/partitions is, e.g.
* major minor #blocks name
* 8 0 33554422 sda
* 8 1 33554400 sda1
*/
STATICTEST QStringList
getPartitionsForDevice( const QString& deviceName )
{
QStringList partitions;
@ -58,7 +49,7 @@ getPartitionsForDevice( const QString& deviceName )
QFile dev_partitions( "/proc/partitions" );
if ( dev_partitions.open( QFile::ReadOnly ) )
{
cDebug() << "Reading from" << dev_partitions.fileName();
cDebug() << "Reading from" << dev_partitions.fileName() << "looking for" << deviceName;
QTextStream in( &dev_partitions );
(void)in.readLine(); // That's the header line, skip it
while ( !in.atEnd() )
@ -81,6 +72,25 @@ getPartitionsForDevice( const QString& deviceName )
return partitions;
}
ClearMountsJob::ClearMountsJob( Device* device )
: Calamares::Job()
, m_device( device )
{
}
QString
ClearMountsJob::prettyName() const
{
return tr( "Clear mounts for partitioning operations on %1" ).arg( m_device->deviceNode() );
}
QString
ClearMountsJob::prettyStatusMessage() const
{
return tr( "Clearing mounts for partitioning operations on %1." ).arg( m_device->deviceNode() );
}
Calamares::JobResult
ClearMountsJob::exec()
{