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

procd: fix/clean some conditions in nand.sh

Browse source 
1) nand_upgrade_tar: use a simpler condition that matches if () { }
   logic and fix check of $kernel_length variable
2) nand_do_upgrade_stage2: use case, otherwise one could believe we
   always call nand_upgrade_tar

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43373
This commit is contained in:
John Crispin 2014-11-24 19:14:29 +00:00
parent 19c18eba93
commit db69761f94
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/system/procd/files/nand.sh
View file

@ -250,10 +250,10 @@ nand_upgrade_tar() {
local has_kernel=1
local has_env=0
[ "kernel_length" = 0 -o -z "$kernel_mtd" ] || {
[ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && {
tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
}
[ "kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
[ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "$has_kernel" "$has_env"
@ -277,9 +277,11 @@ nand_do_upgrade_stage2() {
[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
[ "$file_type" = "ubi" ] && nand_upgrade_ubinized $1
[ "$file_type" = "ubifs" ] && nand_upgrade_ubifs $1
nand_upgrade_tar $1
case "$file_type" in
"ubi") nand_upgrade_ubinized $1;;
"ubifs") nand_upgrade_ubifs $1;;
*) nand_upgrade_tar $1;;
esac
}
nand_upgrade_stage2() {