Merge "Initialize customMemoryBackingFiles with empty array" into main
diff --git a/guest/shutdown_runner/debian/service b/guest/shutdown_runner/debian/service
index d19ff25..7188d36 100644
--- a/guest/shutdown_runner/debian/service
+++ b/guest/shutdown_runner/debian/service
@@ -6,6 +6,8 @@
[Service]
ExecStart=/usr/bin/bash -c '/usr/bin/shutdown_runner --grpc_port $(cat /mnt/internal/debian_service_port)'
Type=simple
+Restart=on-failure
+RestartSec=1
User=root
Group=root
diff --git a/tests/backcompat_test/src/main.rs b/tests/backcompat_test/src/main.rs
index 4d09a89..b92049d 100644
--- a/tests/backcompat_test/src/main.rs
+++ b/tests/backcompat_test/src/main.rs
@@ -25,7 +25,6 @@
use anyhow::anyhow;
use anyhow::Context;
use anyhow::Error;
-use log::error;
use log::info;
use std::fs::read_to_string;
use std::fs::File;
@@ -188,15 +187,15 @@
return Err(anyhow!("failed to execute dtc"));
}
let dt2 = read_to_string("dump_dt_failed.dts")?;
- error!(
+ eprintln!(
"Device tree 2 does not match golden DT.\n
Device Tree 2: {}",
dt2
);
return Err(anyhow!(
- "stdout: {:?}\n stderr: {:?}",
- dtcompare_res.stdout,
- dtcompare_res.stderr
+ "stdout: {}\n stderr: {}",
+ String::from_utf8_lossy(&dtcompare_res.stdout),
+ String::from_utf8_lossy(&dtcompare_res.stderr)
));
}