aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Maciej Nowak <tomek_n@o2.pl>2018-01-25 00:04:56 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-02 21:33:08 +0100
commitb1317a10f74455bfbb126d0d0962f5c191865b5c (patch)
tree6587cfc0cc1ecaa4a8ecddea33499ac4b45273ef
parent0ef28ea3875809ec4bebee29d908f31dd7c42b86 (diff)
downloadupstream-b1317a10f74455bfbb126d0d0962f5c191865b5c.tar.gz
upstream-b1317a10f74455bfbb126d0d0962f5c191865b5c.tar.bz2
upstream-b1317a10f74455bfbb126d0d0962f5c191865b5c.zip
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>
-rw-r--r--target/linux/mvebu/base-files/lib/preinit/79_move_config3
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/clearfog.sh2
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 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