From 6a9c80c1b0fdb3901733b43d427fc16b3e282667 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Fri, 5 Apr 2013 17:22:25 +0300
Subject: [PATCH] End group when reading complete section in deviceinfo

---
 libssu/ssudeviceinfo.cpp |  1 +
 ssuks/ssuks.cpp          | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp
index 11f0d67..047c89d 100644
--- a/libssu/ssudeviceinfo.cpp
+++ b/libssu/ssudeviceinfo.cpp
@@ -293,6 +293,7 @@ void SsuDeviceInfo::variableSection(QString section, QHash<QString, QString> *st
   foreach (const QString &key, keys){
     storageHash->insert(key, boardMappings->value(key).toString());
   }
+  boardMappings->endGroup();
 }
 
 void SsuDeviceInfo::setDeviceModel(QString model){
diff --git a/ssuks/ssuks.cpp b/ssuks/ssuks.cpp
index 9825e0b..eb11287 100644
--- a/ssuks/ssuks.cpp
+++ b/ssuks/ssuks.cpp
@@ -43,19 +43,26 @@ void SsuKs::run(){
     }
 
 
+    Sandbox *sb;
     if (repoParameters.contains("sandbox")){
       QString sandbox = repoParameters.value("sandbox");
       repoParameters.remove("sandbox");
 
-      qout << "Using sandbox at " << sandbox << endl;
-      Sandbox *sb = new Sandbox(sandbox, Sandbox::UseAsSkeleton, Sandbox::ThisProcess);
+      sb = new Sandbox(sandbox, Sandbox::UseAsSkeleton, Sandbox::ThisProcess);
       sb->addWorldFiles(SSU_BOARD_MAPPING_CONFIGURATION_DIR);
-      sb->activate();
+      sb->addWorldFiles("/etc/ssu");
+      sb->addWorldFiles("/usr/share/ssu");
+      if (sb->activate())
+        qout << "Using sandbox at " << sandbox << endl;
+      else {
+        qout << "Failed to activate sandbox" << endl;
+        return;
+      }
     }
 
-    SsuKickstarter kickstarter;
-    kickstarter.setRepoParameters(repoParameters);
-    kickstarter.write(fileName);
+    SsuKickstarter *kickstarter = new SsuKickstarter();
+    kickstarter->setRepoParameters(repoParameters);
+    kickstarter->write(fileName);
   } else
     usage();