From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 14 Jul 2014 14:53:15 +0000 (+0000)
Subject: [procd]: allow overriding the kernel partition's name
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=d861638fee46c78bbf497ceeee0435bed0938466;p=openwrt.git

[procd]: allow overriding the kernel partition's name

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


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41646 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index 5f307d09b0..4aa56e37ae 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -4,6 +4,9 @@
 
 . /lib/functions.sh
 
+# 'kernel' partition on NAND contains the kernel
+CI_KERNPART="kernel"
+
 # 'ubi' partition on NAND contains UBI
 CI_UBIPART="ubi"
 
@@ -221,7 +224,7 @@ nand_upgrade_ubifs() {
 nand_upgrade_tar() {
 	local tar_file="$1"
 	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 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
 
 	[ "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