Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a83daa8 authored by Todd Poynor's avatar Todd Poynor
Browse files

dumpstate: dump console-ramoops instead of last_kmsg if present 

Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
parent 1b5143bf

cmds/dumpstate/dumpstate.c

+11 −3
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ static const char *dump_traces_path = NULL; 


static char screenshot_path[PATH_MAX] = "";



#define PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops"



/* dumps the current system state to stdout */

static void dumpstate() {

    time_t now = time(NULL);
@@ -161,8 +163,14 @@ static void dumpstate() { 
    dump_file("NETWORK ROUTES", "/proc/net/route");

    dump_file("NETWORK ROUTES IPV6", "/proc/net/ipv6_route");



    if (!stat(PSTORE_LAST_KMSG, &st)) {

        /* Also TODO: Make console-ramoops CAP_SYSLOG protected. */

        dump_file("LAST KMSG", PSTORE_LAST_KMSG);

    } else {

        /* TODO: Make last_kmsg CAP_SYSLOG protected. b/5555691 */

        dump_file("LAST KMSG", "/proc/last_kmsg");

    }



    dump_file("LAST PANIC CONSOLE", "/data/dontpanic/apanic_console");

    dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads");