diff mbox

[LEDE-DEV,v2,17/19] x86: sysupgrade: explicitly rescan disk after writing partition table

Message ID 2936a464a13b22e7cefd36c02f560337fe10e175.1494704975.git.mschiffer@universe-factory.net
State Accepted
Headers show

Commit Message

Matthias Schiffer May 13, 2017, 7:56 p.m. UTC
This should ensure that the kernel partition can be mounted in
platform_copy_config when its size has changed.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 target/linux/x86/base-files/lib/upgrade/platform.sh | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox

Patch

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 4fa71999be..439ba8f512 100644
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -70,6 +70,12 @@  platform_do_upgrade() {
 
 	if [ -n "$diff" ]; then
 		get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
+
+		# Separate removal and addtion is necessary; otherwise, partition 1
+		# will be missing if it overlaps with the old partition 2
+		partx -d - "/dev/$diskdev"
+		partx -a - "/dev/$diskdev"
+
 		return 0
 	fi