[source] base-files: nand: use CI_KERNPART whenever the kernel volume is needed

[LEDE Commits]

blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/7783f31359cbd912245785e8861ceeb7feb9a8a1

commit 7783f31359cbd912245785e8861ceeb7feb9a8a1
Author: Christian Lamparter <chunkeey at googlemail.com>
AuthorDate: Tue May 30 20:03:39 2017 +0000

    base-files: nand: use CI_KERNPART whenever the kernel volume is needed
    
    The sender domain has a DMARC Reject/Quarantine policy which disallows
    sending mailing list messages using the original "From" header.
    
    To mitigate this problem, the original message has been wrapped
    automatically by the mailing list software.
    This patch is in continuation of: commit 93aa86040523
    "procd: nand: make it possible to configure kernel and ubi partition"
    
    The $CI_KERNPART variable should be used in place
    of the fixed "kernel" partition name. This allows
    targets to specifiy alternate names for the kernel
    partition.
    
    Cc: Chris Blake <chrisrblake93 at gmail.com>
    Signed-off-by: Christian Lamparter <chunkeey at googlemail.com>
---
 package/base-files/files/lib/upgrade/nand.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 894964e..6b2bdba 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -142,7 +142,7 @@ nand_upgrade_prepare_ubi() {
 		}
 	fi
 
-	local kern_ubivol="$( nand_find_volume $ubidev kernel )"
+	local kern_ubivol="$( nand_find_volume $ubidev $CI_KERNPART )"
 	local root_ubivol="$( nand_find_volume $ubidev rootfs )"
 	local data_ubivol="$( nand_find_volume $ubidev rootfs_data )"
 
@@ -157,13 +157,13 @@ nand_upgrade_prepare_ubi() {
 	fi
 
 	# kill volumes
-	[ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N kernel || true
+	[ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N $CI_KERNPART || true
 	[ "$root_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs || true
 	[ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || true
 
 	# update kernel
 	if [ "$has_kernel" = "1" ]; then
-		if ! ubimkvol /dev/$ubidev -N kernel -s $kernel_length; then
+		if ! ubimkvol /dev/$ubidev -N $CI_KERNPART -s $kernel_length; then
 			echo "cannot create kernel volume"
 			return 1;
 		fi
@@ -270,7 +270,7 @@ nand_upgrade_tar() {
 
 	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
 	[ "$has_kernel" = "1" ] && {
-		local kern_ubivol="$(nand_find_volume $ubidev kernel)"
+		local kern_ubivol="$(nand_find_volume $ubidev $CI_KERNPART)"
 	 	tar xf $tar_file sysupgrade-$board_name/kernel -O | \
 			ubiupdatevol /dev/$kern_ubivol -s $kernel_length -
 	}