diff options
| author | Weizhao Ouyang <o451686892@gmail.com> | 2023-04-18 15:56:43 +0800 |
|---|---|---|
| committer | Weizhao Ouyang <o451686892@gmail.com> | 2023-04-18 15:58:02 +0800 |
| commit | 18750c523676bd7cf828862c7283537f6bf82013 (patch) | |
| tree | 846e7189bfaf7488f1a472cb1584388f7c603088 /f2fs_utils | |
| parent | 20f400b7768ae8a337085d9b8804478b3d120f97 (diff) | |
| download | extras-18750c523676bd7cf828862c7283537f6bf82013.tar.gz | |
f2fs_utils: Capture sload error
Throw correct sload errors from piped processes.
Test: build userdata.img without error
Signed-off-by: Weizhao Ouyang <o451686892@gmail.com>
Change-Id: Ic71ba9febeb7c89095b908ea94cf02ca5388a668
Diffstat (limited to 'f2fs_utils')
| -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)) } |