Merge pull request #204 from calamares/cleartempmountsjob

New ClearTempMountsJob, to be executed before partitioning jobs.

src/modules/partition/CMakeLists.txt

@@ -44,6 +44,7 @@ calamares_add_plugin( partition
         gui/ReplacePage.cpp
         jobs/CheckFileSystemJob.cpp
         jobs/ClearMountsJob.cpp
+        jobs/ClearTempMountsJob.cpp
         jobs/CreatePartitionJob.cpp
         jobs/CreatePartitionTableJob.cpp
         jobs/DeletePartitionJob.cpp

src/modules/partition/core/PartitionCoreModule.cpp

@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <core/PartitionModel.h>
 #include <core/PMUtils.h>
 #include <jobs/ClearMountsJob.h>
+#include <jobs/ClearTempMountsJob.h>
 #include <jobs/CreatePartitionJob.h>
 #include <jobs/CreatePartitionTableJob.h>
 #include <jobs/DeletePartitionJob.h>
@@ -281,6 +282,8 @@ PartitionCoreModule::jobs() const
     QList< Calamares::job_ptr > lst;
     QList< Device* > devices;
 
+    lst << Calamares::job_ptr( new ClearTempMountsJob() );
+
     for ( auto info : m_deviceInfos )
     {
         if ( info->isDirty() )

src/modules/partition/jobs/ClearTempMountsJob.cpp

@@ -0,0 +1,94 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ClearTempMountsJob.h"
+
+#include <util/report.h>
+#include <utils/Logger.h>
+
+#include <QFile>
+#include <QProcess>
+#include <QStringList>
+
+
+ClearTempMountsJob::ClearTempMountsJob()
+    : Calamares::Job()
+{
+}
+
+
+QString
+ClearTempMountsJob::prettyName() const
+{
+    return tr( "Clear all temporary mounts." );
+}
+
+
+Calamares::JobResult
+ClearTempMountsJob::exec()
+{
+    // Fetch a list of current mounts to Calamares temporary directories.
+    QList< QPair < QString, QString > > lst;
+    QFile mtab( "/etc/mtab" );
+    if ( !mtab.open( QFile::ReadOnly | QFile::Text ) )
+        return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) );
+
+    cDebug() << "Opened mtab. Lines:";
+    QTextStream in(&mtab);
+    QString lineIn = in.readLine();
+    while ( !lineIn.isNull() )
+    {
+        QStringList line = lineIn.split( ' ', QString::SkipEmptyParts );
+        cDebug() << line.join( ' ' );
+        QString device = line.at( 0 );
+        QString mountPoint = line.at( 1 );
+        if ( mountPoint.startsWith( "/tmp/calamares-" ) )
+        {
+            cDebug() << "INSERTING pair (device, mountPoint)" << device << mountPoint;
+            lst.append( qMakePair( device, mountPoint ) );
+        }
+        lineIn = in.readLine();
+    }
+
+    qSort( lst.begin(), lst.end(), []( const QPair< QString, QString >& a,
+                                       const QPair< QString, QString >& b ) -> bool
+    {
+        return a.first > b.first;
+    } );
+
+    QStringList goodNews;
+    QProcess process;
+
+    foreach ( auto line, lst )
+    {
+        QString partPath = line.second;
+        cDebug() << "Will try to umount path" << partPath;
+        process.start( "umount", { "-lv", partPath } );
+        process.waitForFinished();
+        if ( process.exitCode() == 0 )
+            goodNews.append( QString( "Successfully unmounted %1." ).arg( partPath ) );
+    }
+
+    Calamares::JobResult ok = Calamares::JobResult::ok();
+    ok.setMessage( tr( "Cleared all temporary mounts." ) );
+    ok.setDetails( goodNews.join( "\n" ) );
+
+    cDebug() << "ClearTempMountsJob finished. Here's what was done:\n" << goodNews.join( "\n" );
+
+    return ok;
+}

src/modules/partition/jobs/ClearTempMountsJob.h

@@ -0,0 +1,39 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CLEARTEMPMOUNTSJOB_H
+#define CLEARTEMPMOUNTSJOB_H
+
+#include <Job.h>
+
+class Device;
+
+/**
+ * This job tries to free all temporary mounts used by Calamares, so partitioning
+ * operations can proceed.
+ */
+class ClearTempMountsJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    explicit ClearTempMountsJob();
+    QString prettyName() const override;
+    Calamares::JobResult exec() override;
+};
+
+#endif // CLEARTEMPMOUNTSJOB_H