Skip to content

Commit 15b0e4d

Browse files
committed
Upload file
1 parent 3e20b8f commit 15b0e4d

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

pio/src/main/assets/home/bin/repack_img

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ saved="$OUTPUT/out/${INPUT##*/}.img"
8484
info_size="${INPUT%/*}/config/${INPUT##*/}_size.txt"
8585
kernel_dts_md5="${INPUT%/*}/config/${INPUT##*/}_kernel_dts_md5.txt"
8686
dts_md5="${INPUT%/*}/config/${INPUT##*/}_dts_md5.txt"
87-
checkro="${INPUT%/*}/config/${INPUT##*/}_f2fs_ro"
8887
MKE2FS_CONFIG="$ETC/mke2fs.conf"
8988

9089
if [[ "$(cat $info)" =~ ^(vendor_boot|boot|vbmeta|vbmeta_system|dtbo)$ ]];then
@@ -253,7 +252,7 @@ elif [ "$partition" == "f2fs" ];then
253252
mount_dir="/${INPUT##*/}"
254253
fi
255254
if [ "$TTBUILDI" == 0 ];then
256-
[ -f "$checkro" ] && f2fsrw=0 || f2fsrw=1
255+
[ "$(cat "$fs_options" 2>/dev/null)" == 1 ] && f2fsrw=0 || f2fsrw=1
257256
fi
258257
[ -f "$TMP/make_f2fs.log" ] && rm -fr "$TMP/make_f2fs.log"
259258
if [ "$f2fsrw" == 1 ];then

pio/src/main/assets/home/bin/unpack_img

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
127127
"$OUTPUT/config/${namepv##*/}_info" \
128128
"$OUTPUT/config/${namepv##*/}_file_contexts" \
129129
"$OUTPUT/config/${namepv##*/}_fs_config" \
130+
"$OUTPUT/config/${namepv##*/}_fs_options" \
130131
"$OUTPUT/config/${namepv##*/}_size.txt" \
131-
"$OUTPUT/config/exception.log" \
132-
"$OUTPUT/config/${namepv##*/}_f2fs_ro"
132+
"$OUTPUT/config/exception.log"
133133

134134
if [ "$dang_file" == 'ext' ];then
135135
imgextractor "$file_img" "$OUTPUT" >$TMP/imgextractor_ext.log
@@ -149,9 +149,13 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
149149
# umount -f -l "$TMP/${namepv##*/}" &>>$TMP/unpack_f2fs.log
150150
# rm -fr "$TMP/${namepv##*/}"
151151
extract.f2fs "$file_img" "$OUTPUT" &>$TMP/unpack_f2fs.log || killtree "Extracting f2fs failed, check log: $TMP/unpack_f2fs.log";
152+
if [ -f "$OUTPUT/config/${namepv##*/}_fs_config" ];then
153+
luu_config="$(cat "$OUTPUT/config/${namepv##*/}_fs_config" | awk '{print "system"$0}' | sort)"
154+
echo "$luu_config" > "$OUTPUT/config/${namepv##*/}_fs_config"
155+
fi
152156
echo "$(stat -c%s "$file_img")" > "$OUTPUT/config/${namepv##*/}_size.txt"
153157
echo "$dang_file" > "$OUTPUT/config/${namepv##*/}_info"
154-
echo "$(fsck.f2fs "$file_img" | grep 'superblock features' | grep -cm1 ro)" > "$OUTPUT/config/${namepv##*/}_f2fs_ro"
158+
echo "$(fsck.f2fs "$file_img" | grep 'superblock features' | grep -cm1 ro)" > "$OUTPUT/config/${namepv##*/}_fs_options"
155159
elif [ "$dang_file" == 'erofs' ];then
156160
extract.erofs -T$threads -x -i "$file_img" -o "$OUTPUT" >$TMP/extract_erofs.log || killtree "\nextract.erofs error: ${namepv##*/}" "$OUTPUT/${namepv##*/}" &
157161
PIDK=$!

0 commit comments

Comments
 (0)