From 4fd6bedb2146b9f51b995cbd16cb6900c9e321ea Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Sat, 6 Apr 2013 01:06:48 +0300
Subject: [PATCH] Add DisplayName for imager

---
 rpm/ssu.changes          |  3 +++
 rpm/ssu.spec             |  2 +-
 ssuks/ssukickstarter.cpp | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/rpm/ssu.changes b/rpm/ssu.changes
index 8fd09ab..902d85a 100644
--- a/rpm/ssu.changes
+++ b/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
 
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index f878ba5..f8c7f43 100644
--- a/rpm/ssu.spec
+++ b/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
diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp
index d799729..e3be040 100644
--- a/ssuks/ssukickstarter.cpp
+++ b/ssuks/ssukickstarter.cpp
@@ -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;
@@ -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;