KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: Create /var/lock directory in platform_do_upgrade_*

Browse source 
The sysupgrade_pre_upgrade hook was removed with 5e1b4c57de ("base-files:
drop fwtool_pre_upgrade") while there were still scripts using it:

* target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
* target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
* target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh

Not running the hooks can either prevent a successful upgrade or brick the
device because the fw_setenv program cannot be started correctly.

Instead of adding this hook again, the directory /var/lock for fw_setenv
can also just be created directly before fw_setenv is called.

Fixes: 5e1b4c57de ("base-files: drop fwtool_pre_upgrade")
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
This commit is contained in:
Sven Eckelmann 2018-10-01 11:48:04 +02:00 committed by Mathias Kresin
parent 11d51276b1
commit c383e0c979
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
View file

@ -3,14 +3,6 @@
# In case the check fails during boot, a failsafe-system is started to provide # In case the check fails during boot, a failsafe-system is started to provide
# a minimal web-interface for flashing a new firmware. # a minimal web-interface for flashing a new firmware.
# create /var/lock for the lock "fw_setenv.lock" of fw_setenv
# the rest is copied using ar71xx's RAMFS_COPY_BIN and RAMFS_COPY_DATA
platform_add_ramfs_ubootenv()
{
mkdir -p $RAM_ROOT/var/lock
}
append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv
# determine size of the main firmware partition # determine size of the main firmware partition
platform_get_firmware_size() { platform_get_firmware_size() {
local dev size erasesize name local dev size erasesize name
@ -152,6 +144,8 @@ rootfs_size $rootfs_hexsize
rootfs_checksum $rootfs_md5 rootfs_checksum $rootfs_md5
bootcmd bootm $vmlinux_hexaddr bootcmd bootm $vmlinux_hexaddr
EOF EOF
mkdir -p /var/lock
fw_setenv -s /tmp/fw_env_upgrade || { fw_setenv -s /tmp/fw_env_upgrade || {
echo "failed to update U-Boot environment" echo "failed to update U-Boot environment"
return 1 return 1

9
target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
View file

@ -26,14 +26,6 @@ cfg_value_get()
done done
} }
# create /var/lock for the lock "fw_setenv.lock" of fw_setenv
# the rest is copied using ar71xx's RAMFS_COPY_BIN and RAMFS_COPY_DATA
platform_add_ramfs_ubootenv()
{
mkdir -p $RAM_ROOT/var/lock
}
append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv
platform_check_image_target_openmesh() platform_check_image_target_openmesh()
{ {
img_board_target="$1" img_board_target="$1"
@ -232,6 +224,7 @@ platform_do_upgrade_openmesh()
printf "rootfs_size %s\n" $rootfs_checksize >> $uboot_env_upgrade printf "rootfs_size %s\n" $rootfs_checksize >> $uboot_env_upgrade
printf "rootfs_checksum %s\n" $rootfs_md5 >> $uboot_env_upgrade printf "rootfs_checksum %s\n" $rootfs_md5 >> $uboot_env_upgrade
mkdir -p /var/lock
fw_setenv -s $uboot_env_upgrade || { fw_setenv -s $uboot_env_upgrade || {
echo "failed to update U-Boot environment" echo "failed to update U-Boot environment"
return 1 return 1