Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recovery: init script mount fixes 

- Added a 5 seconds delay before mounting external disks so they have
  time to be recognized in the system.
- Check if UBI volume is mounted before formatting it.
- Check if eMMC block device exists before formatting it.

Signed-off-by: David Escalona <david.escalona@digi.com>
This commit is contained in:
David Escalona 2016-12-28 16:55:18 +01:00
parent 047849b848
commit f4ece3821e
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
View File

@ -248,6 +248,12 @@ format_ubi_volume() {
if [ -z "${mtd_num}" ]; then if [ -z "${mtd_num}" ]; then
quit_with_error "Could not find MTD partition for volume '${1}'" quit_with_error "Could not find MTD partition for volume '${1}'"
else else
# Umount in case partition is mounted, ignore errors.
if grep -qs "${1}" /proc/mounts; then
local path="$(sed -ne "s/.*:${1} \(.*\) ubifs.*/\1/g;T;p" /proc/mounts 2>/dev/null)"
umount "${path}" >/dev/null 2>&1
ubidetach -p "/dev/mtd${mtd_num}" >/dev/null 2>&1
fi
# Format MTD partition. # Format MTD partition.
ubiformat "/dev/mtd${mtd_num}" >/dev/null 2>&1 ubiformat "/dev/mtd${mtd_num}" >/dev/null 2>&1
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
@ -277,16 +283,20 @@ format_ubi_volume() {
format_emmc_block() { format_emmc_block() {
# Find partition block number. # Find partition block number.
local partition_block="/dev/mmcblk0p$(parted -s /dev/mmcblk0 print | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<${1}\>.*,\1,g;T;p")" local partition_block="/dev/mmcblk0p$(parted -s /dev/mmcblk0 print | sed -ne "s,^[^0-9]*\([0-9]\+\).*\<${1}\>.*,\1,g;T;p")"
# Umount in case partition is mounted, ignore errors. if [ -b "${partition_block}" ]; then
if grep -qs "${partition_block}" /proc/mounts; then # Umount in case partition is mounted, ignore errors.
umount "${partition_block}" >/dev/null 2>&1 if grep -qs "${partition_block}" /proc/mounts; then
fi umount "${partition_block}" >/dev/null 2>&1
# Format emmc block. fi
mkfs.ext4 "${partition_block}" >/dev/null 2>&1 # Format emmc block.
if [ "$?" = "0" ]; then mkfs.ext4 "${partition_block}" >/dev/null 2>&1
log "Partition '${1}' successfully erased!" if [ "$?" = "0" ]; then
log "Partition '${1}' successfully erased!"
else
quit_with_error "Error erasing '${1}' partition"
fi
else else
quit_with_error "Error erasing '${1}' partition" quit_with_error "Could not find partition block for '${1}'"
fi fi
} }
@ -376,6 +386,7 @@ if [ -n "${update_package_bool}" ]; then
else else
log "Update package location: ${update_package}" log "Update package location: ${update_package}"
# Mount external disks. # Mount external disks.
sleep 5
mount_external_disks mount_external_disks
# Mount update partition. # Mount update partition.
mount_partition update "${UPDATE_MOUNT_DIR}" mount_partition update "${UPDATE_MOUNT_DIR}"