From: Matthias Schiffer Date: Wed, 3 May 2017 07:08:29 +0000 (+0200) Subject: x86: sysupgrade: explicitly rescan disk after writing partition table X-Git-Tag: v18.06.0-rc1~2833 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dac07ca05bab5ba61e109d05b66acc394c497016;p=oweals%2Fopenwrt.git x86: sysupgrade: explicitly rescan disk after writing partition table This should ensure that the kernel partition can be mounted in platform_copy_config when its size has changed. Signed-off-by: Matthias Schiffer --- 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