RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-01-01 20:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

base-files: clean up ubinized sysupgrade code

Browse Source 
Remove redundant check from nand ubinized sysupgrade code. This check
has already been done in the only caller of the affected function:
nand_do_upgrade.

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
This commit is contained in:
Rodrigo Balerdi 2022-04-15 06:42:51 -03:00 committed by Daniel Golle
parent 264d948302
commit de4b65a793
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/base-files/files/lib/upgrade/nand.sh
View File

@ -236,11 +236,6 @@ nand_upgrade_ubinized() {
local ubi_file="$1"
local mtdnum="$(find_mtd_index "$CI_UBIPART")"
[ ! "$mtdnum" ] && {
CI_UBIPART="rootfs"
mtdnum="$(find_mtd_index "$CI_UBIPART")"
}
if [ ! "$mtdnum" ]; then
echo "cannot find mtd device $CI_UBIPART"
umount -a
@ -248,10 +243,11 @@ nand_upgrade_ubinized() {
fi
local mtddev="/dev/mtd${mtdnum}"
ubidetach -p "${mtddev}" || true
ubidetach -p "${mtddev}" || :
sync
ubiformat "${mtddev}" -y -f "${ubi_file}"
ubiattach -p "${mtddev}"
nand_do_upgrade_success
}
@ -333,7 +329,7 @@ nand_upgrade_tar() {
nand_do_upgrade() {
local file_type=$(identify $1)
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART=rootfs
case "$file_type" in
"fit") nand_upgrade_fit $1;;