Make authfs start optional
Only start the service if the VM config requests it.
Make CompOS explicitly request authfs, since it requires it.
Also improve the error messages if authfs is missing (which I
triggered while working on this).
This doesn't include restricting the use of the config option, but we
have a seperate bug to handle that in general.
Bug: 245262525
Test: atest MicrodroidTests MicrodroidHostTestCases
Change-Id: I4363daf0f5cfb0c1c7ffbb7ae2ca2b9cc395167d
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index e3ad495..7629291 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -323,6 +323,11 @@
let config = load_config(Path::new(&metadata.payload_config_path))?;
+ let task = config
+ .task
+ .as_ref()
+ .ok_or_else(|| MicrodroidError::InvalidConfig("No task in VM config".to_string()))?;
+
if config.extra_apks.len() != verified_data.extra_apks_data.len() {
return Err(anyhow!(
"config expects {} extra apks, but found only {}",
@@ -338,18 +343,23 @@
// Start tombstone_transmit if enabled
if config.export_tombstones {
- system_properties::write("ctl.start", "tombstone_transmit")
- .context("Failed to start tombstone_transmit")?;
+ control_service("start", "tombstone_transmit")?;
} else {
- system_properties::write("ctl.stop", "tombstoned").context("Failed to stop tombstoned")?;
+ control_service("stop", "tombstoned")?;
}
- ensure!(
- config.task.is_some(),
- MicrodroidError::InvalidConfig("No task in VM config".to_string())
- );
+ // Start authfs if enabled
+ if config.enable_authfs {
+ control_service("start", "authfs_service")?;
+ }
+
system_properties::write("dev.bootcomplete", "1").context("set dev.bootcomplete")?;
- exec_task(&config.task.unwrap(), service)
+ exec_task(task, service)
+}
+
+fn control_service(action: &str, service: &str) -> Result<()> {
+ system_properties::write(&format!("ctl.{}", action), service)
+ .with_context(|| format!("Failed to {} {}", action, service))
}
struct ApkDmverityArgument<'a> {