commit b5e1ca17ec37b8e735961f347ce87803645ae9c1
author Steve Fung <stevefung@google.com> Mon Sep 14 16:14:23 2015 -0700
committer Steve Fung <stevefung@google.com> Mon Sep 14 16:16:27 2015 -0700
tree e17b3b603c95ba1132b1503091f3a6e115803f9b
parent 14cb2f67adbeb98c85509e906f92556d868df268

crash_reporter: Add model_manifest_id field to report

Add the model_manifest_id from weave's configuration to the
crash report.

Bug: 22874192
Change-Id: I26d5334a6eb3b82fd07338e98ce0f3efbb2ff16d

crash_sender

diff --git a/crash_sender b/crash_sender
index 7f9062a..6907d14 100755
--- a/crash_sender
+++ b/crash_sender
@@ -79,6 +79,9 @@
 # Set this to 1 to allow uploading of device coredumps.
 DEVCOREDUMP_UPLOAD_FLAG_FILE="${CRASH_STATE_DIR}/device_coredump_upload_allowed"
 
+# The weave configuration file.
+WEAVE_CONF_FILE="/etc/weaved/weaved.conf"
+
 # The syslog tag for all logging we emit.
 TAG="$(basename $0)[$$]"
 
@@ -288,6 +291,7 @@
   local version="$(get_key_value "${meta_path}" "upload_var_ver")"
   local upload_prefix="$(get_key_value "${meta_path}" "upload_prefix")"
   local guid
+  local model_manifest_id="$(get_key_value "${WEAVE_CONF_FILE}" "model_id")"
 
   set -- \
     -F "write_payload_size=${write_payload_size}" \
@@ -441,6 +445,7 @@
     -F "ver=${version}" \
     -F "hwclass=${hwclass}" \
     -F "exec_name=${exec_name}" \
+    -F "model_manifest_id=${model_manifest_id}" \
     ${image_type:+-F "image_type=${image_type}"} \
     ${boot_mode:+-F "boot_mode=${boot_mode}"} \
     ${error_type:+-F "error_type=${error_type}"} \