From 72efa88b64d2518f504603e6182eff7f6ae1ba9e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 10 Jul 2014 19:16:31 +0000 Subject: [PATCH] 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 SVN-Revision: 41564 --- package/system/procd/files/nand.sh | 4 ++-- 1 file 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 -- 2.25.1