Initial support for booting from MSD

- search for drive that contains recovery.rfs to determine NOOBS drive
- export $PARTUUIDx environment variable to partition setup scripts
- put method_reformatDrive() code back

Author: maxnet

buildroot/.config

@@ -1873,7 +1873,7 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 # BR2_PACKAGE_UTIL_LINUX_MINIX is not set
 # BR2_PACKAGE_UTIL_LINUX_NSENTER is not set
 # BR2_PACKAGE_UTIL_LINUX_MORE is not set
-# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 # BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set
 # BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set
 # BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set

buildroot/kernelconfig-recovery.armv6

@@ -104,6 +104,9 @@ CONFIG_HID_SUNPLUS=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DWCOTG=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_BCM2835=y

buildroot/kernelconfig-recovery.armv7

@@ -110,6 +110,9 @@ CONFIG_HID_SUNPLUS=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DWCOTG=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_BCM2835=y

recovery/bootselectiondialog.cpp

@@ -22,9 +22,10 @@
 #include <QDesktopWidget>
 #include <QScreen>
 #include <QWSServer>
+#include <QRegExp>
 #include <QDebug>
 
-BootSelectionDialog::BootSelectionDialog(const QString &defaultPartition, QWidget *parent) :
+BootSelectionDialog::BootSelectionDialog(const QString &drive, const QString &defaultPartition, QWidget *parent) :
     QDialog(parent),
     _countdown(11),
     ui(new Ui::BootSelectionDialog)
@@ -39,14 +40,14 @@ BootSelectionDialog::BootSelectionDialog(const QString &defaultPartition, QWidge
     dir.mkdir("/settings");
 
     if (QProcess::execute("mount -o remount,ro /settings") != 0
-        && QProcess::execute("mount -t ext4 -o ro " SETTINGS_PARTITION " /settings") != 0)
+        && QProcess::execute("mount -t ext4 -o ro "+partdev(drive, SETTINGS_PARTNR)+" /settings") != 0)
     {
         QMessageBox::critical(this, tr("Cannot display boot menu"), tr("Error mounting settings partition"));
         return;
     }
 
-    /* Also mount /dev/mmcblk0p1 as it may contain icons we need */
-    if (QProcess::execute("mount -t vfat -o ro /dev/mmcblk0p1 /mnt") != 0)
+    /* Also mount recovery partition as it may contain icons we need */
+    if (QProcess::execute("mount -t vfat -o ro "+partdev(drive, 1)+" /mnt") != 0)
     {
         /* Not fatal if this fails */
     }
@@ -105,12 +106,15 @@ BootSelectionDialog::BootSelectionDialog(const QString &defaultPartition, QWidge
             ui->list->installEventFilter(this);
 
             // Select OS booted previously
-            QByteArray partstr = "/dev/mmcblk0p"+QByteArray::number(partition);
+            QString partnrStr = QString::number(partition);
+            QRegExp partnrRx("([0-9]+)$");
             for (int i=0; i<ui->list->count(); i++)
             {
                 QVariantMap m = ui->list->item(i)->data(Qt::UserRole).toMap();
-                if (m.value("partitions").toList().first() == partstr)
+                QString bootpart = m.value("partitions").toList().first().toString();
+                if (partnrRx.indexIn(bootpart) != -1 && partnrRx.cap(1) == partnrStr)
                 {
+                    qDebug() << "Previous OS at" << bootpart;
                     ui->list->setCurrentRow(i);
                     break;
                 }
@@ -153,8 +157,13 @@ void BootSelectionDialog::accept()
     QSettings settings("/settings/noobs.conf", QSettings::IniFormat, this);
     QVariantMap m = item->data(Qt::UserRole).toMap();
     QByteArray partition = m.value("partitions").toList().first().toByteArray();
-    partition.replace("/dev/mmcblk0p", "");
-    int partitionNr    = partition.toInt();
+    QRegExp partnrRx("([0-9]+)$");
+    if (partnrRx.indexIn(partition) == -1)
+    {
+        QMessageBox::critical(this, "noobs.conf corrupt", "Not a valid partition: "+partition);
+        return;
+    }
+    int partitionNr    = partnrRx.cap(1).toInt();
     int oldpartitionNr = settings.value("default_partition_to_boot", 0).toInt();
 
     if (partitionNr != oldpartitionNr)

recovery/bootselectiondialog.h

@@ -24,7 +24,7 @@ class BootSelectionDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit BootSelectionDialog(const QString &defaultPartition, QWidget *parent = 0);
+    explicit BootSelectionDialog(const QString &drive, const QString &defaultPartition, QWidget *parent = 0);
     ~BootSelectionDialog();
     virtual void accept();
     void setDisplayMode();

recovery/config.h

@@ -24,12 +24,10 @@
  * Multiple lists can be specified by space separating the URLs */
 #define DEFAULT_REPO_SERVER  "http://downloads.raspberrypi.org/os_list_v3.json"
 
-/* Size of recovery FAT partition in MB.
- * First partition starts at offset 1 MB (sector 2048)
- * If you want the second partition to start at offset 1024 MB, enter 1023 */
+/* Size of recovery FAT partition in MB when using reformat drive initialization method. */
 #define RESCUE_PARTITION_SIZE  63
 
-/* Files that are currently on the FAT partition are normaaly saved to memory during
+/* Files that are currently on the FAT partition are normally saved to memory during
  * repartitioning.
  * If files they are larger than number of MB, try resizing the FAT partition instead */
 #define MAXIMUM_BOOTFILES_SIZE  64
@@ -41,14 +39,12 @@
    if that prevents having a 4 MiB gap between the next one */
 #define SHRINK_PARTITIONS_TO_MINIMIZE_GAPS
 
-#define SETTINGS_PARTITION  "/dev/mmcblk0p5"
+#define SETTINGS_PARTNR   5
 #define SETTINGS_PARTITION_SIZE  (32 * 2048 - PARTITION_GAP)
 
 /* If the image name matches this exactly, mark it as recommended */
 #define RECOMMENDED_IMAGE "Raspbian"
 
-#define FAT_PARTITION_OF_IMAGE  "/dev/mmcblk0p6"
-
 /* RiscOS magic */
 #define RISCOS_OFFSET_KEY "riscos_offset"
 #define RISCOS_OFFSET (1760)