hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bcm53xx: upgrade: fix RAMFS_COPY_* 

Fixes: 30f61a34b4 "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
openwrt-18.06
Matthias Schiffer 2017-06-10 16:14:54 +02:00
parent 7a29e44f90
commit 73f675415c
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/stage2
View File

@ -48,7 +48,7 @@ switch_to_ramfs() {
/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \ /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \ /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \ /bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
/bin/mknod /bin/touch /bin/mknod /bin/touch /bin/sed
install_bin /sbin/mtd install_bin /sbin/mtd
install_bin /sbin/mount_root install_bin /sbin/mount_root

4
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@ -1,3 +1,5 @@
RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama'
PART_NAME=firmware PART_NAME=firmware
# $(1): file to read magic from # $(1): file to read magic from
@ -260,8 +262,6 @@ platform_pre_upgrade_seama() {
} }
platform_pre_upgrade() { platform_pre_upgrade() {
export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed"
local file_type=$(platform_identify "$1") local file_type=$(platform_identify "$1")
[ "$(platform_flash_type)" != "nand" ] && return [ "$(platform_flash_type)" != "nand" ] && return