[openwrt/openwrt] mvebu: remove fs declaration in mount commands

LEDE Commits lede-commits at lists.infradead.org
Fri Mar 2 12:52:59 PST 2018


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/b1317a10f74455bfbb126d0d0962f5c191865b5c

commit b1317a10f74455bfbb126d0d0962f5c191865b5c
Author: Tomasz Maciej Nowak <tomek_n at o2.pl>
AuthorDate: Thu Jan 25 00:04:56 2018 +0100

    mvebu: remove fs declaration in mount commands
    
    Allows to have other file system for boot partition without breaking
    sysupgrade.
    
    Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
---
 target/linux/mvebu/base-files/lib/preinit/79_move_config | 3 ++-
 target/linux/mvebu/base-files/lib/upgrade/clearfog.sh    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/linux/mvebu/base-files/lib/preinit/79_move_config b/target/linux/mvebu/base-files/lib/preinit/79_move_config
index b0ee62a..1735ad8 100644
--- a/target/linux/mvebu/base-files/lib/preinit/79_move_config
+++ b/target/linux/mvebu/base-files/lib/preinit/79_move_config
@@ -10,8 +10,9 @@ move_config() {
 		insmod fat
 		insmod vfat
 		mkdir -p /boot
-		mount -t vfat -o rw,noatime $BOOTPART /boot
+		mount -o rw,noatime $BOOTPART /boot
 		[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
+		umount /boot
 	fi
 }
 
diff --git a/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh b/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh
index 5388b22..b6dbde8 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/clearfog.sh
@@ -25,7 +25,7 @@ platform_do_upgrade_clearfog() {
 
 platform_copy_config_clearfog() {
 	mkdir -p /boot
-	[ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime /dev/mmcblk0p1 /boot
+	[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/mmcblk0p1 /boot
 	cp -af "$CONF_TAR" /boot/
 	sync
 	umount /boot



More information about the lede-commits mailing list