aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2020-11-02 21:04:24 +0800
committerYousong Zhou <yszhou4tech@gmail.com>2020-11-02 21:09:22 +0800
commitbd0b8200687c69df543a7e3ef043baa39d7784be (patch)
treebe7b5eb26442362917abac7893da898c05662a37
parent4b7165722cb0e2ba62ab68e8b90d4d4b0909744c (diff)
downloadupstream-bd0b8200687c69df543a7e3ef043baa39d7784be.tar.gz
upstream-bd0b8200687c69df543a7e3ef043baa39d7784be.tar.bz2
upstream-bd0b8200687c69df543a7e3ef043baa39d7784be.zip
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@redfish-solutions.com> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
-rw-r--r--target/linux/x86/base-files/lib/upgrade/platform.sh2
1 files changed, 1 insertions, 1 deletions
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