From: Matthias Schiffer Date: Sat, 10 Jun 2017 14:14:54 +0000 (+0200) Subject: bcm53xx: upgrade: fix RAMFS_COPY_* X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=73f675415c00656caa2ebab762654f56dc3b98bc;p=openwrt%2Fstaging%2Fblogic.git bcm53xx: upgrade: fix RAMFS_COPY_* Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade" Signed-off-by: Matthias Schiffer --- diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index bdbb89266432..9d12cc801cf9 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -48,7 +48,7 @@ switch_to_ramfs() { /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/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/mount_root diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index f2e007db22fa..6a9e4950450c 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -1,3 +1,5 @@ +RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama' + PART_NAME=firmware # $(1): file to read magic from @@ -260,8 +262,6 @@ platform_pre_upgrade_seama() { } platform_pre_upgrade() { - export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed" - local file_type=$(platform_identify "$1") [ "$(platform_flash_type)" != "nand" ] && return