Merge remote branch 'dream/master'

libo · Jan 26, 2011 · efbf70c · efbf70c
2 parents cb9ee45 + ce38faa
commit efbf70c
Show file tree

Hide file tree

Showing 6 changed files with 1,837 additions and 1,728 deletions.
diff --git a/main/bsod.cpp b/main/bsod.cpp
@@ -191,6 +191,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=");