X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fbsod.cpp;h=f55939ed1ee872343a15b3b65ea57a74faab1870;hp=f76283e785c07268b83eaa1937f71982d11be65f;hb=023864f9fe2db4ef8f74057b1afb21446b6b7ef7;hpb=d47f7407cb034d3237ca978f36c75bf8300c56c1

diff --git a/main/bsod.cpp b/main/bsod.cpp
index f76283e..f55939e 100644
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -18,7 +18,11 @@
 
 /************************************************/
 
+#ifdef BUILD_VUPLUS /* ikseong  */
+#define CRASH_EMAILADDR "crashlog"
+#else
 #define CRASH_EMAILADDR "crashlog@dream-multimedia-tv.de"
+#endif
 #define INFOFILE "/maintainer.info"
 
 #define RINGBUFFER_SIZE 16384
@@ -183,6 +187,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=");
@@ -199,9 +204,9 @@ void bsodFatal(const char *component)
 		xml.close();
 
 		xml.open("software");
-		xml.cDataFromCmd("enigma2software", "ipkg list_installed | grep enigma2");
-		xml.cDataFromCmd("dreamboxsoftware", "ipkg list_installed | grep dream");
-		xml.cDataFromCmd("gstreamersoftware", "ipkg list_installed | grep gst");
+		xml.cDataFromCmd("enigma2software", "opkg list_installed | grep enigma2");
+		xml.cDataFromCmd("dreamboxsoftware", "opkg list_installed | grep dream");
+		xml.cDataFromCmd("gstreamersoftware", "opkg list_installed | grep gst");
 		xml.close();
 
 		xml.open("crashlogs");
@@ -216,7 +221,7 @@ void bsodFatal(const char *component)
 
 	ePtr<gMainDC> my_dc;
 	gMainDC::getInstance(my_dc);
-	
+    
 	gPainter p(my_dc);
 	p.resetOffset();
 	p.resetClip(eRect(ePoint(0, 0), my_dc->size()));
@@ -228,11 +233,11 @@ void bsodFatal(const char *component)
 	p.clear();
 
 	eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100);
-	
-	std::string text("We are really sorry. Your Dreambox encountered "
+    
+	std::string text("We are really sorry. Your STB encountered "
 		"a software problem, and needs to be restarted. "
 		"Please send the logfile created in /hdd/ to " + crash_emailaddr + ".\n"
-		"Your Dreambox restarts in 10 seconds!\n"
+		"Your STB restarts in 10 seconds!\n"
 		"Component: " + crash_component);
 
 	p.renderText(usable_area, text.c_str(), gPainter::RT_WRAP|gPainter::RT_HALIGN_LEFT);