commit | 1c9b7d417677e17c5922656d2345a64855c6732e | [log] [tgz] |
---|---|---|
author | Akilesh Kailash <akailash@google.com> | Tue Mar 18 05:59:13 2025 -0700 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 18 05:59:13 2025 -0700 |
tree | cbc397b926d9104e0b59187a4820c5b6217cc815 | |
parent | ff109630021bc3f8014babbd1dc2c6174a9cb5ec [diff] | |
parent | 87baaef7c86f0b1ddef3f78045e0ce22eaa9dbc8 [diff] |
Merge "Run e2fsck during vm start" into main am: 87baaef7c8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3547203 Change-Id: I59399183bb5889950d57bb307a464cb61280963a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.kt b/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.kt index 7acc5f3..a4663c8 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.kt +++ b/android/TerminalApp/java/com/android/virtualization/terminal/InstalledImage.kt
@@ -116,11 +116,12 @@ val roundedUpDesiredSize = roundUp(desiredSize) val curSize = getSize() + runE2fsck(rootPartition) + if (roundedUpDesiredSize == curSize) { return roundedUpDesiredSize } - runE2fsck(rootPartition) if (roundedUpDesiredSize > curSize) { allocateSpace(rootPartition, roundedUpDesiredSize) }