Merge branch 'jb32529' into 'master'

Jb32529

See merge request !12

.gitignore

@@ -11,6 +11,7 @@ doc/latex
 /rndssucli/ssuproxy.h
 /.nodocs
 ssucli/ssuproxy.h
+ssucli/ssuproxy.cpp
 *.o
 RPMS/
 installroot/

ssucli/ssuproxy.cpp

-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -c SsuProxy -p ssucli/ssuproxy.h:ssucli/ssuproxy.cpp dbus/org.nemo.ssu.xml
- *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "ssucli/ssuproxy.h"
-
-/*
- * Implementation of interface class SsuProxy
- */
-
-SsuProxy::SsuProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-SsuProxy::~SsuProxy()
-{
-}
-

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;