Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add DisplayName for imager
  • Loading branch information
Bernd Wachter committed Apr 5, 2013
1 parent 362cd34 commit 4fd6bed
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
3 changes: 3 additions & 0 deletions rpm/ssu.changes
@@ -1,3 +1,6 @@
* Fri Apr 05 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.31.2
- Add DisplayName for imager

* Fri Apr 05 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.31.1
- Add output directory for kickstarter

Expand Down
2 changes: 1 addition & 1 deletion rpm/ssu.spec
@@ -1,5 +1,5 @@
Name: ssu
Version: 0.31.1
Version: 0.31.2
Release: 1
Summary: SSU enabler for RND
Group: System/Base
Expand Down
16 changes: 13 additions & 3 deletions ssuks/ssukickstarter.cpp
Expand Up @@ -220,10 +220,11 @@ bool SsuKickstarter::write(QString kickstart){

if (kickstart.isEmpty()){
if (repoOverride.contains("filename")){
QString fileName = QString("%1/%2")
.arg(repoOverride.value("outputdir"))
.arg(var.resolveString(repoOverride.value("filename"), &repoOverride));

ks.setFileName(repoOverride.value("outputdir") +
var.resolveString(repoOverride.value("filename"),
&repoOverride));
ks.setFileName(fileName);
ks.open(QIODevice::WriteOnly);
} else {
qerr << "No filename specified, and no default filename configured" << endl;
Expand All @@ -236,7 +237,16 @@ bool SsuKickstarter::write(QString kickstart){
ks.open(QIODevice::WriteOnly);
}

QString displayName = QString("# DisplayName: %1 %2/%3 (%4) %5")
.arg(repoOverride.value("brand"))
.arg(deviceInfo.deviceModel())
.arg(repoOverride.value("arch"))
.arg((rndMode ? "rnd"
: "release"))
.arg(repoOverride.value("version"));

kout.setDevice(&ks);
kout << displayName << endl << endl;

kout << commands().join("\n") << endl << endl;
kout << partitions().join("\n") << endl << endl;
Expand Down

0 comments on commit 4fd6bed

Please sign in to comment.