aboutsummaryrefslogtreecommitdiffstats
path: root/package/system/procd
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-11-24 19:14:29 +0000
committerJohn Crispin <john@openwrt.org>2014-11-24 19:14:29 +0000
commitdb69761f9494ca3ebb7ebb559872809de061d973 (patch)
treec604874e4b795ff972fc239c57e222f213407e0b /package/system/procd
parent19c18eba9377eb9ee549f8c663467e2cb6531db5 (diff)
downloadupstream-db69761f9494ca3ebb7ebb559872809de061d973.tar.gz
upstream-db69761f9494ca3ebb7ebb559872809de061d973.tar.bz2
upstream-db69761f9494ca3ebb7ebb559872809de061d973.zip
procd: fix/clean some conditions in nand.sh
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
Diffstat (limited to 'package/system/procd')
-rw-r--r--package/system/procd/files/nand.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index 0d30810b83..1da63e2cc1 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -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() {