Provisional fix for #70 (requires testing). Also adds ability to create

missing MBR and warn users to reinstall NOOBS.

Author: Rob-Bishop

output

@@ -1,12 +1,12 @@
 /* Prepare SD card for first use thread
  *
  * Initial author: Floris Bos
- *                                                                                                                                                                            
- * Initial author: Floris Bos                                                                                                                                                 
- * Maintained by Raspberry Pi                                                                                                                                                   
- *                                                                                                                                                                            
- * See LICENSE.txt for license details                                                                                                                                        
- *                                                                                                                                                                           
+ *
+ * Initial author: Floris Bos
+ * Maintained by Raspberry Pi
+ *
+ * See LICENSE.txt for license details
+ *
  */
 
 
@@ -183,7 +183,27 @@ bool InitDriveThread::method_resizePartitions()
 
     if (!QFile::exists("/dev/mmcblk0p1"))
     {
-        emit error(tr("SD card does not have a MBR. Cannot resize FAT partition."));
+        //emit error(tr("SD card does not have a MBR. Cannot resize FAT partition."));
+        // Warn user that their SD card does not have an MBR and ask
+        // if they would like us to create one for them
+
+        // Create MBR containing single FAT partition
+        QProcess proc;
+        proc.setProcessChannelMode(proc.MergedChannels);
+        proc.start("parted /dev/mmcblk0 --script -- mkpartfs primary fat32 0 -1");
+        proc.waitForFinished(-1);
+        if (proc.exitCode() != 0)
+        {
+            // Warn user if we failed to create an MBR on their card
+            emit error(tr("Error creating MBR")+"\n"+proc.readAll());
+            return false;
+        }
+        qDebug() << "Created missing MBR on SD card. parted output:" << proc.readAll();
+
+        // Advise user that their SD card has now been formatted
+        // suitably for installing NOOBS and that they will have to
+        // re-copy the files before rebooting
+        emit error(tr("SD card has now been formatted ready for NOOBS installation. Please re-copy the NOOBS files onto the card and reboot"));
         return false;
     }
 
@@ -271,7 +291,7 @@ bool InitDriveThread::method_resizePartitions()
         QThread::msleep(1500);
     }
 
-    QProcess::execute("/sbin/dosfslabel /dev/mmcblk0p1 RECOVERY");
+    //QProcess::execute("/sbin/dosfslabel /dev/mmcblk0p1 RECOVERY");
 
     emit statusUpdate(tr("Mounting FAT partition"));
     if (!mountSystemPartition())