aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-10-05 10:27:49 +0000
committerJohn Crispin <blogic@openwrt.org>2015-10-05 10:27:49 +0000
commitfda7d8be3e6278028917c25bed456902260ea11b (patch)
tree4b408b221b5ef7320209cc012f36119b9b62fc15
parent2249ee53d92ce3569d7f3accf26374c104705a19 (diff)
downloadmaster-187ad058-fda7d8be3e6278028917c25bed456902260ea11b.tar.gz
master-187ad058-fda7d8be3e6278028917c25bed456902260ea11b.tar.bz2
master-187ad058-fda7d8be3e6278028917c25bed456902260ea11b.zip
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
-rw-r--r--target/linux/brcm2708/base-files/lib/preinit/79_move_config6
-rw-r--r--target/linux/brcm2708/base-files/lib/upgrade/platform.sh7
2 files changed, 7 insertions, 6 deletions
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 7bcea7bf6f..b0ee62a809 100644
--- 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 3e1ee0067c..1d4b694574 100644
--- 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
}