Merge changes I2f516e4a,Ic20247f1 into main am: 4800221c53
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3321235
Change-Id: I9fac32295bd82dc0a657444681ac9e2b4df6858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index a0e46d2..1212525 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -297,7 +297,7 @@
private static void runE2fsck(String filePath) throws IOException {
try {
- runCommand("/system/bin/e2fsck", "-f", filePath);
+ runCommand("/system/bin/e2fsck", "-y", "-f", filePath);
Log.d(TAG, "e2fsck completed: " + filePath);
} catch (IOException e) {
Log.e(TAG, "Failed to run e2fsck", e);
diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 86b3571..707f285 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -920,7 +920,8 @@
.arg(format!("--shared-dir={}", &shared_path.path))
.arg("--cfg")
.arg(cfg_arg.as_str())
- .arg("--disable-sandbox");
+ .arg("--disable-sandbox")
+ .arg("--skip-pivot-root=true");
print_crosvm_args(&command);