ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-06 19:19:31 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

procd: correctly identify ubifs in tar file

Browse Source 
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
This commit is contained in:
John Crispin 2014-07-10 19:16:31 +00:00
parent be26421f45
commit 72efa88b64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/procd/files/nand.sh
View File

@ -180,7 +180,7 @@ nand_do_upgrade_success() {
sync sync
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" [ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successfull" echo "sysupgrade successful"
reboot -f 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 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_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_kernel=1
local has_env=0 local has_env=0