mirror of
https://github.com/hak5/wifipineapple-openwrt.git
synced 2025-10-29 16:57:19 +00:00
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
This commit is contained in:
parent
0126e7505e
commit
19594fc3ed
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user