aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-23 20:02:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-23 20:02:02 +0000
commit5ae2524d3a3250b5cfcedea0560d84bdfd3b81f0 (patch)
tree8aa400b50255fd6cad3ae1b8ab32b9243838e10c /package/base-files/files
parentbc8fe9b40fdd0817bad2b7ec7664e8eeaa97e1f5 (diff)
downloadupstream-5ae2524d3a3250b5cfcedea0560d84bdfd3b81f0.tar.gz
upstream-5ae2524d3a3250b5cfcedea0560d84bdfd3b81f0.tar.bz2
upstream-5ae2524d3a3250b5cfcedea0560d84bdfd3b81f0.zip
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
Diffstat (limited to 'package/base-files/files')
-rw-r--r--package/base-files/files/lib/preinit/10_essential_fs6
-rw-r--r--package/base-files/files/lib/preinit/10_indicate_preinit1
-rw-r--r--package/base-files/files/lib/preinit/20_device_fs_mount4
-rw-r--r--package/base-files/files/lib/preinit/40_mount_devpts2
-rw-r--r--package/base-files/files/lib/preinit/80_mount_root2
5 files changed, 7 insertions, 8 deletions
diff --git a/package/base-files/files/lib/preinit/10_essential_fs b/package/base-files/files/lib/preinit/10_essential_fs
index ab317dc20a..5d979fd49a 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 ab69305180..4a0109cc17 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 832b1cf399..ed59b5b237 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 2d5010b912..b75d692878 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 cc8781687e..ad24fb8ace 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