Removed the console to re-enable presubmit testing for gki branches
Bug: 138616941
Test: Treehugger, local boot with gki branches
Change-Id: I135b1d073aa6859162bafcf503d571b67948099a
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index 1af7923..3dc865c 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -57,7 +57,6 @@
DEFINE_string(extra_kernel_cmdline, "",
"Additional flags to put on the kernel command line");
DEFINE_int32(loop_max_part, 7, "Maximum number of loop partitions");
-DEFINE_string(console, "ttyS0", "Console device for the guest kernel.");
DEFINE_string(androidboot_console, "ttyS1",
"Console device for the Android framework");
DEFINE_string(
@@ -384,9 +383,6 @@
tmp_config_obj.add_kernel_cmdline(
concat("androidboot.setupwizard_mode=", FLAGS_setupwizard_mode));
tmp_config_obj.add_kernel_cmdline(concat("loop.max_part=", FLAGS_loop_max_part));
- if (!FLAGS_console.empty()) {
- tmp_config_obj.add_kernel_cmdline(concat("console=", FLAGS_console));
- }
if (!FLAGS_androidboot_console.empty()) {
tmp_config_obj.add_kernel_cmdline(
concat("androidboot.console=", FLAGS_androidboot_console));
diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index ea55e69..91c61ca 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -124,11 +124,13 @@
crosvm_cmd.AddParameter("--cid=", config_->vsock_guest_cid());
}
+ // TODO (138616941) re-enable the console on its own serial port
+
// Redirect the first serial port with the kernel logs to the appropriate file
crosvm_cmd.AddParameter("--serial=num=1,type=file,path=",
- config_->kernel_log_pipe_name());
+ config_->kernel_log_pipe_name(),",console=true");
// Use stdio for the second serial port, it contains the serial console.
- crosvm_cmd.AddParameter("--serial=num=2,type=stdout,console=true");
+ crosvm_cmd.AddParameter("--serial=num=2,type=stdout");
// Redirect standard input and output to a couple of pipes for the console
// forwarder host process to handle.
