Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb39097' into 'master'
Suggest developer-mode to rnd images by default.

See merge request !14
  • Loading branch information
saukko committed Oct 2, 2017
2 parents 1b8d1e8 + 3b54e04 commit c4875af
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions ssuks/ssukickstarter.cpp
Expand Up @@ -347,15 +347,19 @@ bool SsuKickstarter::write(const QString &kickstart)

QStringList featuresList = deviceInfo.value("img-features").toStringList();

// Add developer-mode feature to rnd images by default
if (rndMode)
featuresList << "developer-mode";

QString suggestedFeatures;

// work around some idiotic JS list parsing on our side by terminating one-element list by comma
if (featuresList.count() == 1)
suggestedFeatures = QString("# SuggestedFeatures: %1,")
.arg(deviceInfo.value("img-features").toStringList().join(", "));
.arg(featuresList.join(", "));
else if (featuresList.count() > 1)
suggestedFeatures = QString("# SuggestedFeatures: %1")
.arg(deviceInfo.value("img-features").toStringList().join(", "));
.arg(featuresList.join(", "));

QString imageType = "fs";
if (!deviceInfo.value("img-type").toString().isEmpty())
Expand Down

0 comments on commit c4875af

Please sign in to comment.