commit 4301cce84e2bbb31c16e1058cea374485d259beb
author Andrew Scull <ascull@google.com> Tue Feb 15 19:59:18 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 15 19:59:18 2022 +0000
tree e9672c60e77f8f867a9bb3f49f28523aec71648e
parent 6de0b067f636b67023c58b2bcde13679996b1680
parent e127cff68ed7d89c8dcfa43969b4b5ea4b058926

Merge "Disable kmsg when microdroid isn't fully debuggable"

microdroid/bootconfig.app_debuggable

diff --git a/microdroid/bootconfig.app_debuggable b/microdroid/bootconfig.app_debuggable
index 98d326a..5257b6e 100644
--- a/microdroid/bootconfig.app_debuggable
+++ b/microdroid/bootconfig.app_debuggable
@@ -4,7 +4,9 @@
 androidboot.microdroid.debuggable=0
 
 # Console output is not redirect to the host-side.
-kernel.console = null
+# TODO(b/219743539) This doesn't successfully disable the console
+kernel.printk.devkmsg=off
+kernel.console=null
 
 # ADB is supported but rooting is prohibited.
 androidboot.adb.enabled=1

microdroid/bootconfig.normal

diff --git a/microdroid/bootconfig.normal b/microdroid/bootconfig.normal
index 9cfb55a..4378dbc 100644
--- a/microdroid/bootconfig.normal
+++ b/microdroid/bootconfig.normal
@@ -2,7 +2,9 @@
 androidboot.microdroid.debuggable=0
 
 # Console output is not redirect to the host-side.
-kernel.console = null
+# TODO(b/219743539) This doesn't successfully disable the console
+kernel.printk.devkmsg=off
+kernel.console=null
 
 # ADB is not enabled.
 androidboot.adb.enabled=0

microdroid_manager/src/main.rs

diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 005baf6..1b3aa7f 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -121,7 +121,7 @@
 }
 
 fn try_main() -> Result<()> {
-    kernlog::init()?;
+    let _ = kernlog::init();
     info!("started.");
 
     let service = get_vms_rpc_binder().context("cannot connect to VirtualMachineService")?;