a8f5051104
783465d783 odhcpd: don't enable server mode on non-static lan port c92c1894a5 odhcpd: backport fixes from master branch (FS#402, FS#524) 4b4a4af814 dnsmasq: bump to v2.78 b8357e87d7 base-files: create /etc/config/ directory 3350137bd3 sunxi: clean up modules definitions a881323cb2 ltq-vdsl-mei: revert disable optimized firmware download f483a35f08 curl: fix security problems e232c6754d mbedtls: update to 2.6.0 CVE-2017-14032 37e1bd27d0 generic: drop 704-phy-no-genphy-soft-reset.patch 720b0e2e2d kernel: update 4.4 to 4.4.89 b428f45c06 ltq-vdsl-mei: disable optimized firmware download 39e5cd9556 ltq-vdsl: fix PM thread suspend and resume handling 86f0e8b091 openvpn: add "extra-certs" option af802bc687 lantiq: fix missing otg_cap on danube platform 12a0da6315 tcpdump: noop commit to refer CVEs fixed in 4.9.2 f66c6e1d8a tcpdump: bump to 4.9.2 a131f7cb69 utils/tcpdump: Rework URLs 7f1359c14e base-files: fix wan6 interface config generation for pppoe 97ebdf93a3 ipq806x: Archer C2600: fix switch ports numbering d33f7905df treewide: fix shellscript syntax errors/typos 4f162ac3ce ramips: fix hg255d LED status support
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Sat, 10 Jun 2017 16:14:54 +0200
|
|
Subject: bcm53xx: upgrade: fix RAMFS_COPY_*
|
|
|
|
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
|
|
index 097ad63adfecdd70019acaa5b652d2056e774c3f..8cc8c8b34e9f349f1d1283ac00f9782b52ab01c1 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 eb6dc823e3890497389716c32ec7e4caf8d30c45..a90a58299dc293afbe15a0b491ef6898402deca4 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
|