[openwrt/openwrt] x86: fix touching bootloader "upgraded" mark

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 2 08:09:51 EST 2020


yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bd0b8200687c69df543a7e3ef043baa39d7784be

commit bd0b8200687c69df543a7e3ef043baa39d7784be
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Mon Nov 2 21:04:24 2020 +0800

    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 <philipp at redfish-solutions.com>
    Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 target/linux/x86/base-files/lib/upgrade/platform.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



More information about the lede-commits mailing list