diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2020-08-19 17:05:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 17:05:03 +0000 |
| commit | b9ae983ce1b717db9d580fb20c8adb9c5c8757c6 (patch) | |
| tree | 2a7c682ea929d3d4d9b280d3dae37fc280f74e0d | |
| parent | 97ef0b6b2d9bfd7239265693722439ad9ffc671f (diff) | |
| parent | 3e6ed7b638b50791996c94dadaefdff5757a0f48 (diff) | |
| download | extras-b9ae983ce1b717db9d580fb20c8adb9c5c8757c6.tar.gz | |
Merge "f2fs: allow filesystem errors corrected" am: 3e6ed7b638
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1403817
Change-Id: I6c3a2fff2932162e70609c9eb9065d7c80b71c51
| -rwxr-xr-x | f2fs_utils/mkf2fsuserimg.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/f2fs_utils/mkf2fsuserimg.sh b/f2fs_utils/mkf2fsuserimg.sh index 264f0ab9..5d8b0d1f 100755 --- a/f2fs_utils/mkf2fsuserimg.sh +++ b/f2fs_utils/mkf2fsuserimg.sh @@ -112,7 +112,10 @@ fi SLOAD_F2FS_CMD="sload_f2fs $SLOAD_OPTS $OUTPUT_FILE" echo $SLOAD_F2FS_CMD $SLOAD_F2FS_CMD -if [ $? -ne 0 ]; then +# allow 1: Filesystem errors corrected +ret=$? +if [ $ret -ne 0 ] && [ $ret -ne 1 ]; then rm -f $OUTPUT_FILE exit 4 fi +exit 0 |