From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 5 May 2017 03:56:10 +0000 (+0200)
Subject: x86: keep /boot mounted for kexec
X-Git-Tag: v17.01.5~236
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=90575776b7062426afb80d7abdc15c1bc67c4c3a;p=oweals%2Fopenwrt.git

x86: keep /boot mounted for kexec

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 63571cb56c7ff2692b5c9aa78133c3f4996e2ac5)
---

diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
index 143ca5147b..7b34d9e5da 100644
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -7,11 +7,14 @@ move_config() {
 	. /lib/upgrade/common.sh
 
 	if export_bootdevice && export_partdevice partdev 1; then
-		if mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt; then
-			if [ -f /mnt/sysupgrade.tgz ]; then
-				mv -f /mnt/sysupgrade.tgz /
+		mkdir -p /boot
+		if mount -t ext4 -o ro,noatime "/dev/$partdev" /boot; then
+			if [ -f /boot/sysupgrade.tgz ]; then
+				mount /boot -o remount,rw,noatime
+				mv -f /boot/sysupgrade.tgz /
+				mount /boot -o remount,ro,noatime
 			fi
-			umount /mnt
+			mount --bind /boot/boot /boot
 		fi
 	fi
 }