bsod.cpp: add /proc/bus/nim_sockets to crashlogs. fixes #608
[enigma2.git] / main / bsod.cpp
index 7256d20a5a19082eaf36d7f253c8dfc3446bc3af..4e0dc3a5dd77b195d0901c8da8290fedc8b3f7d7 100644 (file)
@@ -1,3 +1,4 @@
+#include <csignal>
 #include <fstream>
 #include <sstream>
 #include <lib/base/eenv.h>
@@ -172,7 +173,6 @@ void bsodFatal(const char *component)
                xml.string("contactemail", crash_emailaddr);
                xml.comment("Please email this crashlog to above address");
 
-               xml.string("skin", getConfigString("config.skin.primary_skin", "Default Skin"));
                xml.string("sourcedate", enigma2_date);
                xml.string("branch", enigma2_branch);
                xml.string("rev", enigma2_rev);
@@ -182,6 +182,7 @@ void bsodFatal(const char *component)
                xml.open("image");
                xml.stringFromFile("dreamboxmodel", "/proc/stb/info/model");
                xml.stringFromFile("kernelcmdline", "/proc/cmdline");
+               xml.stringFromFile("nimsockets", "/proc/bus/nim_sockets");
                if (!getConfigBool("config.plugins.crashlogautosubmit.sendAnonCrashlog", true)) {
                        xml.cDataFromFile("dreamboxca", "/proc/stb/info/ca");
                        xml.cDataFromFile("enigma2settings", eEnv::resolve("${sysconfdir}/enigma2/settings"), ".password=");
@@ -300,7 +301,6 @@ void handleFatalSignal(int signum, siginfo_t *si, void *ctx)
 void bsodCatchSignals()
 {
        struct sigaction act;
-       act.sa_handler = SIG_DFL;
        act.sa_sigaction = handleFatalSignal;
        act.sa_flags = SA_RESTART | SA_SIGINFO;
        if (sigemptyset(&act.sa_mask) == -1)