aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-07-10 19:16:31 +0000
committerJohn Crispin <blogic@openwrt.org>2014-07-10 19:16:31 +0000
commit19594fc3eddf7ae1689f2f1707fb7f93aec0db15 (patch)
treedb88bd2b8a0c0a56d73e32817decb617da833119
parent0126e7505eade8497c8fff9efc302b875450b081 (diff)
downloadupstream-19594fc3eddf7ae1689f2f1707fb7f93aec0db15.tar.gz
upstream-19594fc3eddf7ae1689f2f1707fb7f93aec0db15.tar.bz2
upstream-19594fc3eddf7ae1689f2f1707fb7f93aec0db15.zip
procd: correctly identify ubifs in tar file
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@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41564 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/system/procd/files/nand.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index 78ac206f4a..032f02a47e 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -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