Merge branch 'jb32529' into 'master'

Jb32529 See merge request !12
sailfishos · Sep 7, 2017 · 62aa4f0 · 62aa4f0
2 parents e5b748c + ebc878e
commit 62aa4f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ doc/latex
 /rndssucli/ssuproxy.h
 /.nodocs
 ssucli/ssuproxy.h
+ssucli/ssuproxy.cpp
 *.o
 RPMS/
 installroot/

diff --git a/ssucli/ssuproxy.cpp b/ssucli/ssuproxy.cpp
diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp
@@ -372,6 +372,7 @@ bool SsuKickstarter::write(const QString &kickstart)
     kout.setDevice(&ks);
     kout << displayName << endl;
     kout << kickstartType << endl;
+    kout << "# DeviceModel: " << deviceInfo.deviceModel() << endl;
     if (!suggestedFeatures.isEmpty())
         kout << suggestedFeatures << endl;
     kout << "# SuggestedImageType: " << imageType << endl;