Allow OS maintainer to use their own video mode settings. Fixes #259

Signed-off-by: Sam Nazarko <[email protected]>
raspberrypi · Feb 6, 2016 · 3042bd3 · 3042bd3
1 parent bc6dc9e
commit 3042bd3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/recovery/multiimagewritethread.cpp b/recovery/multiimagewritethread.cpp
@@ -486,7 +486,8 @@ bool MultiImageWriteThread::processImage(OsInfo *image)
     Json::saveToFile("/mnt2/os_config.json", qm);
 
     emit statusUpdate(tr("%1: Saving display mode to config.txt").arg(os_name));
-    patchConfigTxt();
+    if ( ! image->managevideo())
+        patchConfigTxt();
 
     /* Partition setup script can either reside in the image folder
      * or inside the boot partition tarball */

diff --git a/recovery/osinfo.cpp b/recovery/osinfo.cpp
@@ -12,6 +12,7 @@ OsInfo::OsInfo(const QString &folder, const QString &flavour, QObject *parent) :
     _releaseDate = m.value("release_date").toString();
     _bootable = m.value("bootable", true).toBool();
     _riscosOffset = m.value("riscos_offset").toInt();
+    _managevideo = m.value("managevideo", false).toBool();
 
     QVariantList parts = Json::loadFromFile(folder+"/partitions.json").toMap().value("partitions").toList();
     foreach (QVariant pv, parts)

diff --git a/recovery/osinfo.h b/recovery/osinfo.h
@@ -53,6 +53,11 @@ class OsInfo : public QObject
         return _bootable;
     }
 
+    inline bool managevideo()
+    {
+        return _managevideo;
+    }
+
     inline QList<PartitionInfo *> *partitions()
     {
         return &_partitions;