From: Tomasz Maciej Nowak <tomek_n@o2.pl>
Date: Tue, 20 Nov 2018 16:20:40 +0000 (+0100)
Subject: x86: mount writable bootfs
X-Git-Tag: v18.06.2~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dab5305e316622a1799edd21a145647d98403132;p=oweals%2Fopenwrt.git

x86: mount writable bootfs

Mount boot file system with rw option to allow installation of packages
which install files to /boot directory.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
(backported from f78b26163790fdf2b53464ab808af10f72e31c3e)
---

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 7b34d9e5da..debce43557 100644
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -8,16 +8,12 @@ move_config() {
 
 	if export_bootdevice && export_partdevice partdev 1; then
 		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
-			mount --bind /boot/boot /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
 	fi
 }
 
 boot_hook_add preinit_mount_root move_config
-