@@ -236,13 +236,12 @@ elif [ "$partition" == "f2fs" ];then
236236 if [ -f " $info_size " ] && [ " $( cat $info ) " == " f2fs" ] && [ " $TTBUILDI " == 0 ]; then
237237 size_real=$( cat $info_size 2> /dev/null) ;
238238 size_real=" $( echo " $SAINEN * 1024 * 1024 + $size_real " | bc) "
239- truncate -s $size_real " $saved "
240239 else
241240 size_orig=" $( du -bs " $INPUT " | awk ' { print $1 }' ) "
242241 size_real=" $( echo " ($SAINEN + 6) * 1024 * 1024 + $size_orig " | bc) "
243- truncate -s $size_real " $saved "
244242 fi
245- if [ -f " $INPUT /${INPUT##*/ } /build.prop" ]; then
243+ truncate -s $size_real " $saved "
244+ if [ -f " $INPUT /system/build.prop" ]; then
246245 mount_dir=" /"
247246 cp -rf " $fs_config " " ${fs_config} _s"
248247 cp -rf " $file_contexts " " ${file_contexts} _s"
@@ -253,26 +252,22 @@ elif [ "$partition" == "f2fs" ];then
253252 else
254253 mount_dir=" /${INPUT##*/ } "
255254 fi
256- echo " Partition size: ${size_real} b, $( coverbyte $size_real ) "
257255 if [ " $TTBUILDI " == 0 ]; then
258256 [ -f " $checkro " ] && f2fsrw=0 || f2fsrw=1
259257 fi
260258 [ -f " $TMP /make_f2fs.log" ] && rm -fr " $TMP /make_f2fs.log"
261259 if [ " $f2fsrw " == 1 ]; then
262- make_f2fs -g android -O compression -r -w 4096 -l " ${INPUT##*/ } " -f " $saved " $size_real || killtree " Error build make_f2fs, Suggestion: Increase free MB" " $saved "
263- echo " "
264- sload_f2fs -t " $mount_dir " -C " $fs_config " -s " $file_contexts " -T $time_build -f " $INPUT " -c " $saved " 2> $TMP /sload_f2fs.log | tee -a $TMP /sload_f2fs.log | sed -e " /Free segments:/d" -e " /Not enough space/d"
260+ make_f2fs -g android -O compression -r -w 4096 -l " ${INPUT##*/ } " -f " $saved " $size_real & > $TMP /make_f2fs.log || killtree " Error build make_f2fs, Suggestion: Increase free MB" " $saved "
261+ sload_f2fs -t " $mount_dir " -C " $fs_config " -s " $file_contexts " -T $time_build -f " $INPUT " -c " $saved " 2>&1 | tee $TMP /sload_f2fs.log | sed -e " /Free segments:/d" -e " /Not enough space/d"
265262 else
266- make_f2fs -g android -O ro -r -w 4096 -l " ${INPUT##*/ } " -f " $saved " $size_real || killtree " Error build make_f2fs, Suggestion: Increase free MB" " $saved "
267- echo " "
268- sload_f2fs -t " $mount_dir " -C " $fs_config " -s " $file_contexts " -T $time_build -f " $INPUT " " $saved " 2> $TMP /sload_f2fs.log | tee -a $TMP /sload_f2fs.log | sed -e " /Free segments:/d" -e " /Not enough space/d"
263+ make_f2fs -g android -O ro -r -w 4096 -l " ${INPUT##*/ } " -f " $saved " $size_real & > $TMP /make_f2fs.log || killtree " Error build make_f2fs, Suggestion: Increase free MB" " $saved "
264+ sload_f2fs -t " $mount_dir " -C " $fs_config " -s " $file_contexts " -T $time_build -f " $INPUT " " $saved " 2>&1 | tee $TMP /sload_f2fs.log | sed -e " /Free segments:/d" -e " /Not enough space/d"
269265 fi
270266 [ " $( grep -cm1 ' Done:' $TMP /sload_f2fs.log) " == 0 ] && killtree " Error build sload_f2fs, Suggestion: Increase free MB, log: $TMP /sload_f2fs.log" " $saved " ;
271- [ -f " $INPUT /${INPUT ##*/ } / build.prop" ] && rm -fr " $file_contexts " " $fs_config "
267+ [ -f " $INPUT /system/ build.prop" ] && rm -f " $file_contexts " " $fs_config "
272268 echo
273269elif [ " $partition " == " ext" ]; then
274270 [ " $DISATFS " == 1 ] || patch " $INPUT " " $fs_config " " $file_contexts " > /dev/null
275- [ -f " $INPUT /${INPUT##*/ } /build.prop" ] && mount_dir=" /" || mount_dir=" /${INPUT##*/ } "
276271 size_real=$( cat $info_size 2> /dev/null) ;
277272 size_orig=" $( du -sb " $INPUT " | awk ' { print $1 }' ) "
278273 if test " $size_orig " -le " 52428800" ; then
@@ -283,7 +278,7 @@ elif [ "$partition" == "ext" ];then
283278 if [ " $SAINEN " == 0 ] && [ " $( cat $info ) " == " ext" ] && [ " $TTBUILDI " == 0 ]; then
284279 if [ " $e2fsdroid " == 1 ]; then
285280 size=" $( echo " $size_real / 4096" | bc) " ;
286- mke2fs -O ^has_journal,^quota,^project,^resize_inode -t ext4 -m 0 -b 4096 -I 256 -L " ${INPUT##*/ } " -M " $mount_dir " " $saved " $size 2>&1
281+ mke2fs -O ^has_journal -t ext4 -m 0 -b 4096 -I 256 -L " ${INPUT##*/ } " -M " / ${INPUT ##*/ } " " $saved " $size 2>&1
287282 e2fsdroid -e -T $time_build -C " $fs_config " -S " $file_contexts " -f " $INPUT " -a " /${INPUT##*/ } " " $saved " 2> $TMP /e2fsdroid_ext.log || killtree " Error build process e2fsdroid, log: $TMP /e2fsdroid_ext.log" " $saved "
288283 else
289284 make_ext4fs -J -T $time_build -L " ${INPUT##*/ } " -S " $file_contexts " -C " $fs_config " -l $size_real -a " /${INPUT##*/ } " " $saved " " $INPUT " || killtree " Error build process make_ext4fs" " $saved " & process_count $size_real " $saved "
@@ -292,7 +287,7 @@ elif [ "$partition" == "ext" ];then
292287 else
293288 if [ " $e2fsdroid " == 1 ]; then
294289 size=" $( echo " $size_orig / 4096" | bc) " ;
295- mke2fs -O ^has_journal,^quota,^project,^resize_inode -t ext4 -m 0 -b 4096 -I 256 -L " ${INPUT##*/ } " -M " $mount_dir " " $saved " $size 2>&1
290+ mke2fs -O ^has_journal -t ext4 -m 0 -b 4096 -I 256 -L " ${INPUT##*/ } " -M " / ${INPUT ##*/ } " " $saved " $size 2>&1
296291 e2fsdroid -e -T $time_build -C " $fs_config " -S " $file_contexts " -f " $INPUT " -a " /${INPUT##*/ } " " $saved " 2> $TMP /e2fsdroid_exts.log || killtree " Error build process e2fsdroid, log: $TMP /e2fsdroid_exts.log" " $saved "
297292 else
298293 make_ext4fs -J -T $time_build -L " ${INPUT##*/ } " -S " $file_contexts " -C " $fs_config " -l $size_orig -a " /${INPUT##*/ } " " $saved " " $INPUT " || killtree " Error build process make_ext4fs" " $saved " & process_count $size_orig " $saved "
0 commit comments