From: Tomasz Maciej Nowak <tomek_n@o2.pl>
Date: Wed, 24 Jan 2018 23:04:56 +0000 (+0100)
Subject: mvebu: remove fs declaration in mount commands
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b1317a10f74455bfbb126d0d0962f5c191865b5c;p=openwrt%2Fstaging%2Fjow.git

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@o2.pl>
---

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 b0ee62a809..1735ad8849 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 5388b22198..b6dbde8458 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