Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental

[enigma2.git] / main / bsod.cpp

diff --git a/main/bsod.cpp b/main/bsod.cpp
index 7256d20a5a19082eaf36d7f253c8dfc3446bc3af..5b01c7c1631ad390f44c50cdcf57549cdf6bb221 100644 (file)
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -1,3 +1,4 @@
+#include <csignal>
 #include <fstream>
 #include <sstream>
 #include <lib/base/eenv.h>
@@ -182,6 +183,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 +302,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)