diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-06-10 16:14:54 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-07-11 17:19:23 +0200 |
| commit | 73f675415c00656caa2ebab762654f56dc3b98bc (patch) | |
| tree | 2825dc934eacd439362ce92d5c5de7493935dcf1 | |
| parent | 7a29e44f9075b14ca959a730faa7fc6e2e23393f (diff) | |
| download | upstream-73f675415c00656caa2ebab762654f56dc3b98bc.tar.gz upstream-73f675415c00656caa2ebab762654f56dc3b98bc.tar.bz2 upstream-73f675415c00656caa2ebab762654f56dc3b98bc.zip | |
bcm53xx: upgrade: fix RAMFS_COPY_*
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
| -rwxr-xr-x | package/base-files/files/lib/upgrade/stage2 | 2 | ||||
| -rw-r--r-- | target/linux/bcm53xx/base-files/lib/upgrade/platform.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index bdbb892664..9d12cc801c 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 f2e007db22..6a9e495045 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 |