brcm2708: keep boot partition mounted to allow users to change config.txt

This way it's easier to configure device tree overlays, customize other
parameters...

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47126 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm2708/base-files/lib/preinit/79_move_config b/target/linux/brcm2708/base-files/lib/preinit/79_move_config
index 7bcea7b..b0ee62a 100644 (file)
--- a/target/linux/brcm2708/base-files/lib/preinit/79_move_config
+++ b/target/linux/brcm2708/base-files/lib/preinit/79_move_config
@@ -9,9 +9,9 @@ move_config() {
                insmod nls_iso8859-1
                insmod fat
                insmod vfat
-               mount -t vfat -o rw,noatime $BOOTPART /mnt
-               [ -f /mnt/sysupgrade.tgz ] && mv -f /mnt/sysupgrade.tgz /
-               umount /mnt
+               mkdir -p /boot
+               mount -t vfat -o rw,noatime $BOOTPART /boot
+               [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
        fi
 }
 

diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
index 3e1ee00..1d4b694 100644 (file)
--- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
@@ -10,8 +10,9 @@ platform_do_upgrade() {
 }
 
 platform_copy_config() {
-       mount -t vfat -o rw,noatime /dev/mmcblk0p1 /mnt
-       cp -af "$CONF_TAR" /mnt/
+       mkdir -p /boot
+       [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime /dev/mmcblk0p1 /boot
+       cp -af "$CONF_TAR" /boot/
        sync
-       umount /mnt
+       umount /boot
 }