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
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Thu, 4 May 2017 07:29:58 +0200
|
|
Subject: sunxi: sysupgrade: don't write partitions twice
|
|
|
|
When existing partitions are retained, the dd call writing the uboot image
|
|
in the space before the first partition was accidentally writing the whole
|
|
image, making the code for individual partitions redundant. Limit the copy
|
|
to 1016KiB (the first 8KiB are skipped, and the first partition starts at
|
|
1024KiB).
|
|
|
|
In addition, conv=notrunc is replaced with conv=fsync. It seems this was an
|
|
oversight, as notrunc doesn't make sense for block devices and all other dd
|
|
commands use conv=fsync.
|
|
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
|
|
index f2cd970d428a780d7497d8802765c656a47ff421..776bdf53bf89c5eafc24b7b59b943e12f3fab77e 100644
|
|
--- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh
|
|
+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
|
|
@@ -43,7 +43,7 @@ platform_do_upgrade() {
|
|
fi
|
|
|
|
#write uboot image
|
|
- get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 conv=notrunc
|
|
+ get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 count=1016 conv=fsync
|
|
#iterate over each partition from the image and write it to the boot disk
|
|
while read part start size; do
|
|
part="$(($part - 2))"
|