diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-04-18 18:25:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-18 18:25:08 +0000 |
| commit | 8bef57e0e97b22723f41a7c6f2110bc8db51d786 (patch) | |
| tree | 85a2432605a9b9b744e9a54f629cbcce7a7e270d | |
| parent | 7774c75781ec2f6a4e0e142e2774d97472e2577c (diff) | |
| parent | 505740ba9d7395e0506d119c7e6ccedd4e1852c4 (diff) | |
| download | extras-8bef57e0e97b22723f41a7c6f2110bc8db51d786.tar.gz | |
Merge "f2fs_utils: Capture sload error" am: b06a92a070 am: 505740ba9d
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2543031
Change-Id: Iaa4197664272d01668fa0e14e3d676469bc4ef47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | f2fs_utils/mkf2fsuserimg.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/f2fs_utils/mkf2fsuserimg.sh b/f2fs_utils/mkf2fsuserimg.sh index 59f9eea5..e95a0c51 100755 --- a/f2fs_utils/mkf2fsuserimg.sh +++ b/f2fs_utils/mkf2fsuserimg.sh @@ -163,13 +163,14 @@ function _build() SLOAD_F2FS_CMD="sload_f2fs $SLOAD_OPTS $OUTPUT_FILE" echo $SLOAD_F2FS_CMD - MB_SIZE=`$SLOAD_F2FS_CMD | grep "Max image size" | awk '{print $5}'` + SLOAD_LOG=`$SLOAD_F2FS_CMD` # allow 1: Filesystem errors corrected ret=$? if [ $ret -ne 0 ] && [ $ret -ne 1 ]; then rm -f $OUTPUT_FILE exit 4 fi + MB_SIZE=`echo "$SLOAD_LOG" | grep "Max image size" | awk '{print $5}'` SIZE=$(((MB_SIZE + 6) * 1024 * 1024)) } |