From: Tomasz Maciej Nowak <tomek_n@o2.pl>
Date: Wed, 28 Nov 2018 19:44:21 +0000 (+0100)
Subject: x86: make sysupgrade.tgz reachable again
X-Git-Tag: v18.06.2~64
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fc38aad1949150d13baf0ad7a261beee0768dc60;p=openwrt%2Fstaging%2Fpepe2k.git

x86: make sysupgrade.tgz reachable again

Moving binding mount before check for saved sysupgrade configuration
made it unreachable. Fix it by moving binding mount after the check.

Fixes: f78b2616 (x86: mount writable bootfs)
Reported-by: Lucian Cristian <luci@powerneth.ro>
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
(backported from c288ad9c2b2a4ab62e4c887f13f220870911cc28)
---

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 debce43557..aff720a52c 100644
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -9,10 +9,10 @@ move_config() {
 	if export_bootdevice && export_partdevice partdev 1; then
 		mkdir -p /boot
 		mount -t ext4 -o rw,noatime "/dev/$partdev" /boot
-		mount --bind /boot/boot /boot
 		if [ -f /boot/sysupgrade.tgz ]; then
 			mv -f /boot/sysupgrade.tgz /
 		fi
+		mount --bind /boot/boot /boot
 	fi
 }