Reduce duplication in bugreport ps output.

PROCESSES AND THREADS and PROCESSES (SELINUX LABELS) can be combined.
I suspect we can just remove PROCESSES too, since it's a strict
subset of the other information, but one step at a time. (The worry
is that someone's actually parsing this output, but it would be good
to find out who's doing that as soon as possible so we can work with
them as we transition to a more complete ps implementation.)

Change-Id: I5f1085f8853f7a988f7edcaeefdd7b63175c1473

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 604d512..ab2376b 100644 (file)
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -314,8 +314,7 @@ static void dumpstate() {
     dump_file("KERNEL SYNC", "/d/sync");
 
     run_command("PROCESSES", 10, "ps", "-P", NULL);
-    run_command("PROCESSES AND THREADS", 10, "ps", "-t", "-p", "-P", NULL);
-    run_command("PROCESSES (SELINUX LABELS)", 10, "ps", "-Z", NULL);
+    run_command("PROCESSES AND THREADS", 10, "ps", "-Z", "-t", "-p", "-P", NULL);
     run_command("LIBRANK", 10, "librank", NULL);
 
     do_dmesg();