Author: kaloz Date: 2014-07-14 16:53:15 +0200 (Mon, 14 Jul 2014) New Revision: 41646
Modified: trunk/package/system/procd/files/nand.sh Log: [procd]: allow overriding the kernel partition's name Signed-off-by: Imre Kaloz <[email protected]> Modified: trunk/package/system/procd/files/nand.sh =================================================================== --- trunk/package/system/procd/files/nand.sh 2014-07-14 14:39:00 UTC (rev 41645) +++ trunk/package/system/procd/files/nand.sh 2014-07-14 14:53:15 UTC (rev 41646) @@ -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_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 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
