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

dualboot: update-firmware: get current active system not using U-Boot variable 

This commit adds a new function to get the active system in a dualboot device
without using 'active_system' U-Boot variable.
This way the script always knows the real active system even when the variable
'active_system' has the value of the next boot active system, for example, after
performing a 'update-firmware --swap-active-system'.

https://onedigi.atlassian.net/browse/DEL-8399

Signed-off-by: Tatiana Leon <Tatiana.Leon@digi.com>
This commit is contained in:
Tatiana Leon 2023-03-22 10:20:10 +01:00
parent ccc4680924
commit eca521f505
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
meta-digi-dey/recipes-digi/dualboot/dualboot/update-firmware
View File

@ -23,7 +23,7 @@ fi
SCRIPTNAME="$(basename "$(readlink -f "${0}")")" SCRIPTNAME="$(basename "$(readlink -f "${0}")")"
VERBOSE="" VERBOSE=""
PUBLIC_KEY="/etc/ssl/certs/key.pub" PUBLIC_KEY="/etc/ssl/certs/key.pub"
ACTIVE_SYSTEM="$(fw_printenv -n active_system 2>/dev/null)" ACTIVE_SYSTEM=""
SHOW_ACTIVE_SYSTEM=0 SHOW_ACTIVE_SYSTEM=0
SCRIPT_MODE=0 SCRIPT_MODE=0
SWAP_ACTIVE_SYSTEM=0 SWAP_ACTIVE_SYSTEM=0
@ -51,14 +51,40 @@ Usage: ${SCRIPTNAME} [OPTIONS] </your-path/your-filename>.swu
EOF EOF
} }
show_active_system() { get_active_system() {
local act_sys="$(echo ${ACTIVE_SYSTEM} | cut -d'_' -f2)" if [ -z "${NANDROOTFS}" ]; then
local MMCROOT_DEV
MMCROOT_DEV="$(stat -c%D /)"
for label in /dev/disk/by-partlabel/*; do
if [ "$(stat -c"%02t%02T" $(realpath ${label}))" = "${MMCROOT_DEV}" ]; then
ACTIVE_SYSTEM="$(basename ${label})"
break
fi
done
else
ACTIVE_SYSTEM="$(sed -ne 's,^\([^[:blank:]]\+\)[[:blank:]]\+/[[:blank:]]\+ubifs.*,\1,g;T;p' /proc/mounts 2>/dev/null)"
fi
if [ -z "${ACTIVE_SYSTEM}" ]; then
echo "[ERROR] Unable to get active system."
return 1
fi
ACTIVE_SYSTEM="$(echo ${ACTIVE_SYSTEM} | cut -d_ -f2)"
return 0
}
show_active_system() {
if [ ${SCRIPT_MODE} -eq 0 ]; then if [ ${SCRIPT_MODE} -eq 0 ]; then
act_sys="$(echo ${act_sys} | tr [:lower:] [:upper:])" local act_sys
act_sys="$(echo ${ACTIVE_SYSTEM} | tr [:lower:] [:upper:])"
echo "Active system is ${act_sys}" echo "Active system is ${act_sys}"
else else
echo "${act_sys}" echo "${ACTIVE_SYSTEM}"
fi fi
} }
@ -112,7 +138,7 @@ update_emmc() {
# Get current partition information so we can # Get current partition information so we can
# determine where to flash the images. # determine where to flash the images.
[ "${ACTIVE_SYSTEM}" = "linux_a" ] && IMAGE_SET="mmc,secondary" [ "${ACTIVE_SYSTEM}" = "a" ] && IMAGE_SET="mmc,secondary"
echo "" echo ""
echo "Updating '${IMAGE_SET}' image set from '${UPDATE_FILE}'..." echo "Updating '${IMAGE_SET}' image set from '${UPDATE_FILE}'..."
@ -127,7 +153,7 @@ update_nand() {
# Get current partition information so we can # Get current partition information so we can
# determine where to flash the images. # determine where to flash the images.
[ "${ACTIVE_SYSTEM}" = "linux_a" ] && IMAGE_SET="mtd,secondary" [ "${ACTIVE_SYSTEM}" = "a" ] && IMAGE_SET="mtd,secondary"
echo "" echo ""
echo "Updating '${IMAGE_SET}' image set from '${UPDATE_FILE}'..." echo "Updating '${IMAGE_SET}' image set from '${UPDATE_FILE}'..."
@ -184,13 +210,15 @@ while :; do
shift shift
done done
get_active_system || exit
# Show active system. # Show active system.
if [ ${SHOW_ACTIVE_SYSTEM} -eq 1 ]; then if [ ${SHOW_ACTIVE_SYSTEM} -eq 1 ]; then
show_active_system show_active_system
exit exit
fi fi
if [ "${ACTIVE_SYSTEM}" = "linux_a" ]; then if [ "${ACTIVE_SYSTEM}" = "a" ]; then
ALT_BOOT="linux_b" ALT_BOOT="linux_b"
ALT_ROOTFS="rootfs_b" ALT_ROOTFS="rootfs_b"
else else