From: Yousong Zhou Date: Mon, 2 Nov 2020 13:04:24 +0000 (+0800) Subject: x86: fix touching bootloader "upgraded" mark X-Git-Tag: v21.02.0-rc1~1209 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bd0b8200687c69df543a7e3ef043baa39d7784be;hp=4b7165722cb0e2ba62ab68e8b90d4d4b0909744c;p=openwrt%2Fopenwrt.git x86: fix touching bootloader "upgraded" mark The mount point is "/tmp/boot", the path in the boot partition is "/boot/grub/upgraded". Origin of this mark b9c1cf16 ("x86: add preinit hook for bootloader upgrade") Fixes 32f675ca ("x86: fix grub-bios-setup fail during sysupgrade") Ref: https://bugs.openwrt.org/index.php?do=details&task_id=3140 Reported-by: Philip Prindeville Signed-off-by: Yousong Zhou --- diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 829834471d..1bcd492dd7 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -63,7 +63,7 @@ platform_do_bootloader_upgrade() { -d "/tmp/boot/boot/grub" \ -r "hd0,${parttable}1" \ "/dev/$diskdev" \ - && touch /tmp/boot/grub/upgraded + && touch /tmp/boot/boot/grub/upgraded umount /tmp/boot fi