diff options
| author | John Crispin <john@openwrt.org> | 2014-07-10 19:16:31 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-07-10 19:16:31 +0000 |
| commit | 72efa88b64d2518f504603e6182eff7f6ae1ba9e (patch) | |
| tree | e1334e47a09ef75ed106c3306640da4be0aaf926 /package/system/procd | |
| parent | be26421f455e392178c98328d142d1d2494e0ede (diff) | |
| download | upstream-72efa88b64d2518f504603e6182eff7f6ae1ba9e.tar.gz upstream-72efa88b64d2518f504603e6182eff7f6ae1ba9e.tar.bz2 upstream-72efa88b64d2518f504603e6182eff7f6ae1ba9e.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>
SVN-Revision: 41564
Diffstat (limited to 'package/system/procd')
| -rw-r--r-- | package/system/procd/files/nand.sh | 4 |
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 |