From 5ae2524d3a3250b5cfcedea0560d84bdfd3b81f0 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 23 Nov 2012 20:02:02 +0000
Subject: [PATCH] base-files: use a natural mount syntax

Busybox built against musl-libc will choke on these otherwise, besides that
it is more natural to use the filesystem type, then options, then name, then
mountpoint.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34308
---
 package/base-files/Makefile                              | 2 +-
 package/base-files/files/lib/preinit/10_essential_fs     | 6 +++---
 package/base-files/files/lib/preinit/10_indicate_preinit | 1 -
 package/base-files/files/lib/preinit/20_device_fs_mount  | 4 ++--
 package/base-files/files/lib/preinit/40_mount_devpts     | 2 +-
 package/base-files/files/lib/preinit/80_mount_root       | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 27ce05164a52..972f96b0cbf5 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=118
+PKG_RELEASE:=119
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/lib/preinit/10_essential_fs b/package/base-files/files/lib/preinit/10_essential_fs
index ab317dc20aeb..5d979fd49a64 100644
--- a/package/base-files/files/lib/preinit/10_essential_fs
+++ b/package/base-files/files/lib/preinit/10_essential_fs
@@ -3,11 +3,11 @@
 # Copyright (C) 2010 Vertical Communications
 
 do_mount_procfs() {
-   mount proc /proc -t proc
+   mount -t proc proc /proc
 }
 
 do_mount_sysfs() {
-    mount sysfs /sys -t sysfs
+   mount -t sysfs sysfs /sys
 }
 
 calc_tmpfs_size() {
@@ -16,7 +16,7 @@ calc_tmpfs_size() {
 
 do_mount_tmpfs() {
     calc_tmpfs_size
-    mount tmpfs /tmp -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777
+    mount -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777 tmpfs /tmp
 }
 
 boot_hook_add preinit_essential do_mount_procfs
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index ab693051808e..4a0109cc1736 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -27,7 +27,6 @@ preinit_net_echo() {
     		     		[ "$pi_failsafe_net_message"  = "true" ] && 
     		         	    [ "$pi_preinit_no_failsafe_netmsg" != "y" ] 
     		         }
-	    			
 		} && netmsg $pi_broadcast "$1"
     	}
 }
diff --git a/package/base-files/files/lib/preinit/20_device_fs_mount b/package/base-files/files/lib/preinit/20_device_fs_mount
index 832b1cf39979..ed59b5b237f6 100644
--- a/package/base-files/files/lib/preinit/20_device_fs_mount
+++ b/package/base-files/files/lib/preinit/20_device_fs_mount
@@ -10,11 +10,11 @@ do_move_devtmpfs() {
 }
 
 do_mount_devfs() {
-    mount devfs /dev -t devfs
+    mount -t devfs devfs /dev
 }
 
 do_mount_hotplug() {
-    mount -t tmpfs tmpfs /dev -o mode=0755,size=512K
+    mount -t tmpfs -o mode=0755,size=512K tmpfs /dev
 }
 
 do_mount_udev() {
diff --git a/package/base-files/files/lib/preinit/40_mount_devpts b/package/base-files/files/lib/preinit/40_mount_devpts
index 2d5010b9122d..b75d692878bc 100644
--- a/package/base-files/files/lib/preinit/40_mount_devpts
+++ b/package/base-files/files/lib/preinit/40_mount_devpts
@@ -7,7 +7,7 @@ init_devpts() {
 }
 
 do_mount_devpts() {
-    mount devpts /dev/pts -t devpts
+    mount -t devpts devpts /dev/pts
 }
 
 boot_hook_add preinit_essential init_devpts
diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root
index cc8781687e1b..ad24fb8ace70 100644
--- a/package/base-files/files/lib/preinit/80_mount_root
+++ b/package/base-files/files/lib/preinit/80_mount_root
@@ -4,7 +4,7 @@
 
 do_mount_root() {
     boot_run_hook preinit_mount_root
-}   
+}
 
 boot_hook_add preinit_main do_mount_root
 
-- 
2.30.2