x86: fix touching bootloader "upgraded" mark
authorYousong Zhou <yszhou4tech@gmail.com>
Mon, 2 Nov 2020 13:04:24 +0000 (21:04 +0800)
committerYousong Zhou <yszhou4tech@gmail.com>
Mon, 2 Nov 2020 13:09:22 +0000 (21:09 +0800)
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 <philipp@redfish-solutions.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
target/linux/x86/base-files/lib/upgrade/platform.sh

index 829834471d301e8b6eac5b5d25b91bd96e8c7824..1bcd492dd75ca13b60c00cf525ee354c66ce7c44 100644 (file)
@@ -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