OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

jffs2 health check on init

pull/262/head
cronyx 2022-07-11 22:33:20 +03:00
parent 0955f92aee
commit 3d9984afe5
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
building.sh
View File

@ -652,7 +652,7 @@ xm550() {
# hi3516cv200 # testing..
# hi3518ev200 # testing..
# hi3518ev200_domsip # DomSip
hi3518ev200_hs303 # OpenIPC
# hi3518ev200_hs303 # OpenIPC
#
# hi3516av100 # OpenIPC
# hi3516av100_ultimate # OpenIPC_ultimate version

20
general/overlay/init
View File

@ -5,8 +5,8 @@ on_exit()
mountpoint -q /proc && umount /proc
exec /sbin/init $*
}
trap on_exit 0
trap on_exit 0
mount -t proc proc /proc || exit
grep -q overlay /proc/filesystems || exit
@ -14,20 +14,24 @@ grep -q overlay /proc/filesystems || exit
if grep -q ubifs /proc/cmdline; then
mount -t ubifs ubi0:rootfs_data /overlay
else
mount -t jffs2 /dev/$(awk -F ':' '/rootfs_data/ {print $1}' /proc/mtd | sed 's/mtd/mtdblock/') /overlay || \
mount -t ubifs ubi0:rootfs_data /overlay || mount -t tmpfs tmpfs /overlay || exit
mtdblkdev=`awk -F ':' '/rootfs_data/ {print $1}' /proc/mtd | sed 's/mtd/mtdblock/'`
mtdchrdev=`grep 'rootfs_data' /proc/mtd | cut -d: -f1`
mount -t jffs2 /dev/${mtdblkdev} /overlay
if [ $? -ne 0 ] || { dmesg | grep "jffs2.*: Magic bitmask.*not found" > /dev/null 2>&1; } then
echo "jffs2 health check error, format required!"
flash_eraseall -j /dev/${mtdchrdev}
mount -t jffs2 /dev/${mtdblkdev} /overlay || mount -t tmpfs tmpfs /overlay || exit
fi
fi
if grep -q overlayfs /proc/filesystems; then
mount -t overlayfs overlayfs -o lowerdir=/,upperdir=/overlay,ro /mnt \
|| { umount /overlay; exit; }
mount -t overlayfs overlayfs -o lowerdir=/,upperdir=/overlay,ro /mnt || { umount /overlay; exit; }
else
overlay_rootdir=/overlay/root
overlay_workdir=/overlay/work
mkdir -p ${overlay_rootdir} ${overlay_workdir}
mount -t overlay overlay \
-o lowerdir=/,upperdir=${overlay_rootdir},workdir=${overlay_workdir} /mnt \
|| { umount /overlay; exit; }
mount -t overlay overlay -o lowerdir=/,upperdir=${overlay_rootdir},workdir=${overlay_workdir} /mnt || { umount /overlay; exit; }
fi
pivot_root /mnt /mnt/rom