bsod: Remove the never used "detailed" crash log and network info
authorMike Looijmans <milo-software@users.sourceforge.net>
Mon, 16 Feb 2015 09:19:48 +0000 (10:19 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Mon, 16 Feb 2015 09:22:03 +0000 (10:22 +0100)
Remove the "detailed crash log" feature, it hasn't been asked for in
over five years, so it's safe to conclude it doesn't add anything useful.

Also remove the references to "crashlogautosubmit", there is no such thing.

data/setup.xml
lib/python/Components/UsageConfig.py
main/bsod.cpp

index d95564f..6e9b647 100644 (file)
@@ -16,7 +16,6 @@
                <item level="2" text="Preferred tuner" description="Configure which tuner will be preferred, when more than one tuner is available. If set to 'auto' the system will give priority to the tuner having the lowest number of channels/satellites.">config.usage.frontend_priority</item>
                <item level="2" text="Preferred tuner for recordings" description="Configure which tuner for recordings will be preferred, when more than one tuner is available.">config.usage.recording_frontend_priority</item>
                <item level="2" text="Disable background scanning" description="When enabled, the receiver will no longer monitor the tuned transponder for possible changes. Do not use this option unless you know what you are doing.">config.misc.disable_background_scan</item>
-               <item level="2" text="Create more detailed crash log" description="Add more details to the crash log">config.crash.details</item>
                <item level="2" text="Include EIT in http streams" description="When enabled, EIT data will be included in http streams. This allows a client receiver to show EPG.">config.streaming.stream_eit</item>
                <item level="2" text="Include AIT in http streams" description="When enabled, AIT data will be included in http streams. This allows a client receiver to use HbbTV.">config.streaming.stream_ait</item>
                <item level="2" text="Include ECM in http streams" description="When enabled, ECM data will be included in http streams. This allows a client receiver to do the descrambling.">config.streaming.stream_ecm</item>
index 659da84..2c9338e 100644 (file)
@@ -342,9 +342,6 @@ def InitUsageConfig():
                ("step", _("Single step (GOP)")),
                ("last", _("Last speed")) ])
 
-
-       config.crash = ConfigSubsection()
-       config.crash.details = ConfigYesNo(default = False)
        config.usage.timerlist_finished_timer_position = ConfigSelection(default = "end", choices = [("beginning", _("At beginning")), ("end", _("At end"))])
 
        def updateEnterForward(configElement):
index 0dfc989..7a97953 100644 (file)
@@ -185,8 +185,6 @@ void bsodFatal(const char *component)
                struct tm tm;
                char tm_str[32];
 
-               bool detailedCrash = getConfigBool("config.crash.details", true);
-
                localtime_r(&t, &tm);
                strftime(tm_str, sizeof(tm_str), "%a %b %_d %T %Y", &tm);
 
@@ -220,38 +218,10 @@ void bsodFatal(const char *component)
                xml.cDataFromCmd("kernelversion", "uname -a");
                xml.stringFromFile("kernelcmdline", "/proc/cmdline");
                xml.stringFromFile("nimsockets", "/proc/bus/nim_sockets");
-               if (!getConfigBool("config.plugins.crashlogautosubmit.sendAnonCrashlog", true)) {
-                       xml.cDataFromFile("stbca", "/proc/stb/info/ca");
-                       xml.cDataFromFile("enigma2settings", eEnv::resolve("${sysconfdir}/enigma2/settings"), ".password=");
-               }
-               if (getConfigBool("config.plugins.crashlogautosubmit.addNetwork", false)) {
-                       xml.cDataFromFile("networkinterfaces", "/etc/network/interfaces");
-                       xml.cDataFromFile("dns", "/etc/resolv.conf");
-                       xml.cDataFromFile("defaultgateway", "/etc/default_gw");
-               }
-               if (getConfigBool("config.plugins.crashlogautosubmit.addWlan", false))
-                       xml.cDataFromFile("wpasupplicant", "/etc/wpa_supplicant.conf");
                xml.cDataFromFile("imageversion", "/etc/image-version");
                xml.cDataFromFile("imageissue", "/etc/issue.net");
                xml.close();
 
-               if (detailedCrash)
-               {
-                       xml.open("software");
-                       xml.cDataFromCmd("enigma2software", "opkg list-installed 'enigma2*'");
-                       if(access("/proc/stb/info/boxtype", F_OK) != -1) {
-                               xml.cDataFromCmd("xtrendsoftware", "opkg list-installed 'et-*'");
-                       }
-                       else if (access("/proc/stb/info/vumodel", F_OK) != -1) {
-                               xml.cDataFromCmd("vuplussoftware", "opkg list-installed 'vuplus*'");
-                       }
-                       else if (access("/proc/stb/info/model", F_OK) != -1) {
-                               xml.cDataFromCmd("dreamboxsoftware", "opkg list-installed 'dream*'");
-                       }
-                       xml.cDataFromCmd("gstreamersoftware", "opkg list-installed 'gst*'");
-                       xml.close();
-               }
-
                xml.open("crashlogs");
                xml.cDataFromString("enigma2crashlog", getLogBuffer());
                xml.close();