domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow overriding the kernel partition's name

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41646
This commit is contained in:
Imre Kaloz
2014-07-14 14:53:15 +00:00
parent 26a4bdc5cf
commit ecb68ba6b4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/system/procd/files/nand.sh
View File

@@ -4,6 +4,9 @@
. /lib/functions.sh . /lib/functions.sh
# 'kernel' partition on NAND contains the kernel
CI_KERNPART="kernel"
# 'ubi' partition on NAND contains UBI # 'ubi' partition on NAND contains UBI
CI_UBIPART="ubi" CI_UBIPART="ubi"
@@ -221,7 +224,7 @@ nand_upgrade_ubifs() {
nand_upgrade_tar() { nand_upgrade_tar() {
local tar_file="$1" local tar_file="$1"
local board_name="$(cat /tmp/sysinfo/board_name)" local board_name="$(cat /tmp/sysinfo/board_name)"
local kernel_mtd="$(find_mtd_index kernel)" local kernel_mtd="$(find_mtd_index $CI_KERNPART)"
local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null` local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null`
local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null` local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null`
@@ -232,7 +235,7 @@ nand_upgrade_tar() {
local has_env=0 local has_env=0
[ "kernel_length" = 0 -o -z "$kernel_mtd" ] || { [ "kernel_length" = 0 -o -z "$kernel_mtd" ] || {
tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - kernel 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