Evan Benn has uploaded this change for review.

View Change

flashrom_tester: Log some cros lsb-release information

os-release does not quite have as much information so use lsb-release.

BUG=None
BRANCH=None
TEST=None

Change-Id: If3452ead9e02e0ddeaa0fdf4852d7c17a8ab7650
---
M util/flashrom_tester/src/cros_sysinfo.rs
M util/flashrom_tester/src/tester.rs
M util/flashrom_tester/src/tests.rs
3 files changed, 29 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/03/69403/1

diff --git a/util/flashrom_tester/src/cros_sysinfo.rs b/util/flashrom_tester/src/cros_sysinfo.rs
index e047f8e..37e1ec6 100644
--- a/util/flashrom_tester/src/cros_sysinfo.rs
+++ b/util/flashrom_tester/src/cros_sysinfo.rs
@@ -34,6 +34,7 @@
 //
 
 use std::ffi::OsStr;
+use std::fs;
 use std::io::Result as IoResult;
 use std::process::{Command, Stdio};
 
@@ -58,3 +59,12 @@
 pub fn bios_info() -> IoResult<String> {
     dmidecode_dispatch(&["-q", "-t0"])
 }
+
+pub fn release_description() -> IoResult<String> {
+    for l in fs::read_to_string("/etc/lsb-release")?.lines() {
+        if l.starts_with("CHROMEOS_RELEASE_DESCRIPTION") {
+            return Ok(l.to_string());
+        }
+    }
+    Err(std::io::ErrorKind::NotFound.into())
+}
diff --git a/util/flashrom_tester/src/tester.rs b/util/flashrom_tester/src/tester.rs
index 96ba34e..2644052 100644
--- a/util/flashrom_tester/src/tester.rs
+++ b/util/flashrom_tester/src/tester.rs
@@ -335,6 +335,7 @@
 pub struct ReportMetaData {
     pub chip_name: String,
     pub os_release: String,
+    pub cros_release: String,
     pub system_info: String,
     pub bios_info: String,
 }
@@ -412,6 +413,7 @@
             println!();
             println!("  %---------------------------%");
             println!("   os release: {}", meta_data.os_release);
+            println!("   cros release: {}", meta_data.cros_release);
             println!("   chip name: {}", meta_data.chip_name);
             println!("   system info: \n{}", meta_data.system_info);
             println!("   bios info: \n{}", meta_data.bios_info);
diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs
index 6f2bf1e..558dcfc 100644
--- a/util/flashrom_tester/src/tests.rs
+++ b/util/flashrom_tester/src/tests.rs
@@ -152,12 +152,14 @@
     }
 
     let os_release = sys_info::os_release().unwrap_or("<Unknown OS>".to_string());
+    let cros_release = cros_sysinfo::release_description().unwrap_or("<Unknown CROS>".to_string());
     let system_info = cros_sysinfo::system_info().unwrap_or("<Unknown System>".to_string());
     let bios_info = cros_sysinfo::bios_info().unwrap_or("<Unknown BIOS>".to_string());
 
     let meta_data = tester::ReportMetaData {
         chip_name,
         os_release,
+        cros_release,
         system_info,
         bios_info,
     };

To view, visit change 69403. To unsubscribe, or for help writing mail filters, visit settings.