[OpenWrt-Devel] [PATCH] procd: correctly identify ubifs in tar file

[Ben Mulvihill]

A missing path prevents the rootfs type contained in a SysupgradeNAND
tar file from being determined correctly.

This fixes it, and also corrects a minor spelling mistake.

Signed-off-by: Ben Mulvihill <ben.mulvihill at gmail.com>
---

--- a/package/system/procd/files/nand.sh	2014-07-09 08:11:04.563205951 +0200
+++ b/package/system/procd/files/nand.sh	2014-07-09 08:11:49.548253354 +0200
@@ -180,7 +180,7 @@ nand_do_upgrade_success() {
 	
 	sync
 	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
-	echo "sysupgrade successfull"
+	echo "sysupgrade successful"
 	reboot -f
 }
 
@@ -226,7 +226,7 @@ nand_upgrade_tar() {
 	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_type="$(identify_tar "$tar_file" root)"
+	local rootfs_type="$(identify_tar "$tar_file" sysupgrade-$board_name/root)"
 
 	local has_kernel=1
 	local has_env=0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel