Mount ro first, remount rw in background

Makes Berryboot feel more responsive recovering after unclean shutdown
magarto · Aug 14, 2014 · 394f5cb · 394f5cb
1 parent a1360c3
commit 394f5cb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/BerrybootGUI2.0/bootmenudialog.cpp b/BerrybootGUI2.0/bootmenudialog.cpp
@@ -180,6 +180,7 @@ void BootMenuDialog::initialize()
 
     if (QFile::exists(runonce_file))
     {
+        waitForRemountRW();
         qpd.setLabelText(tr("Removing runonce file"));
         QApplication::processEvents();
         QByteArray runonce = file_get_contents(runonce_file);
@@ -298,6 +299,7 @@ void BootMenuDialog::bootImage(const QString &name)
 {
     int currentmemsplit = currentMemsplit();
     int needsmemsplit   = imageNeedsMemsplit(name);
+    waitForRemountRW();
 
     if (_i->isMemsplitHandlingEnabled() && needsmemsplit && needsmemsplit != currentmemsplit)
     {
@@ -347,6 +349,7 @@ void BootMenuDialog::startInstaller()
 {
     startNetworking();
     mountSystemPartition();
+    waitForRemountRW();
     accept();
 }
 
@@ -460,7 +463,7 @@ QByteArray BootMenuDialog::getBootOptions()
 
 bool BootMenuDialog::mountDataPartition(const QString &dev)
 {
-    QString mountoptions = "-o noatime";
+    QString mountoptions = "-o noatime,ro";
 
     if (!QFile::exists("/mnt"))
         mkdir("/mnt", 0755);
@@ -475,8 +478,13 @@ bool BootMenuDialog::mountDataPartition(const QString &dev)
         mountoptions += " -t ext4";
     }
 
-    if (QProcess::execute("mount "+mountoptions+" /dev/"+dev+" /mnt") != 0)
+    /* Try mounting read-only first.
+     * If that fails try mounting read-write straight away as it might recover from journal */
+    if (QProcess::execute("mount "+mountoptions+" /dev/"+dev+" /mnt") != 0
+        && QProcess::execute("mount "+mountoptions.replace(",ro","")+" /dev/"+dev+" /mnt") != 0)
+    {
         return false;
+    }
 
     if (!QFile::exists("/mnt/images"))
     {
@@ -487,9 +495,27 @@ bool BootMenuDialog::mountDataPartition(const QString &dev)
         return false;
     }
 
+    /* Remount read-write in the background */
+    _remountproc.start("mount -o remount,rw /mnt");
+
     return true;
 }
 
+void BootMenuDialog::waitForRemountRW()
+{
+    if (_remountproc.state() != _remountproc.NotRunning)
+    {
+        QProgressDialog qpd(tr("Remounting data partition read-write"), QString(), 0, 0, this);
+        qpd.show();
+        QApplication::processEvents();
+
+        if (!_remountproc.waitForFinished())
+        {
+            QMessageBox::critical(this, tr("Error remounting data partition"), tr("Timed out waiting for remounting data partition read-write to complete"), QMessageBox::Ok);
+        }
+    }
+}
+
 bool BootMenuDialog::waitForDevice(const QString &dev)
 {
     QTime t;

diff --git a/BerrybootGUI2.0/bootmenudialog.h b/BerrybootGUI2.0/bootmenudialog.h
@@ -30,6 +30,7 @@
 #include <QDialog>
 #include <QTimer>
 #include <QModelIndex>
+#include <QProcess>
 
 namespace Ui {
 class BootMenuDialog;
@@ -150,11 +151,16 @@ class BootMenuDialog : public QDialog
      * Stop SSH daemon
      */
     void stopSSHserver();
+    /*
+     * Wait for remount RW
+     */
+    void waitForRemountRW();
 
     Ui::BootMenuDialog *ui;
     Installer *_i;
     int _countdown;
     QTimer _countdownTimer;
+    QProcess _remountproc;
 
 protected slots:
     void on_bootButton_clicked();