mirror of https://github.com/hak5/openwrt.git
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: 34308lede-17.01
parent
bc8fe9b40f
commit
5ae2524d3a
|
@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||||
include $(INCLUDE_DIR)/version.mk
|
include $(INCLUDE_DIR)/version.mk
|
||||||
|
|
||||||
PKG_NAME:=base-files
|
PKG_NAME:=base-files
|
||||||
PKG_RELEASE:=118
|
PKG_RELEASE:=119
|
||||||
|
|
||||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
||||||
PKG_BUILD_DEPENDS:=opkg/host
|
PKG_BUILD_DEPENDS:=opkg/host
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
# Copyright (C) 2010 Vertical Communications
|
# Copyright (C) 2010 Vertical Communications
|
||||||
|
|
||||||
do_mount_procfs() {
|
do_mount_procfs() {
|
||||||
mount proc /proc -t proc
|
mount -t proc proc /proc
|
||||||
}
|
}
|
||||||
|
|
||||||
do_mount_sysfs() {
|
do_mount_sysfs() {
|
||||||
mount sysfs /sys -t sysfs
|
mount -t sysfs sysfs /sys
|
||||||
}
|
}
|
||||||
|
|
||||||
calc_tmpfs_size() {
|
calc_tmpfs_size() {
|
||||||
|
@ -16,7 +16,7 @@ calc_tmpfs_size() {
|
||||||
|
|
||||||
do_mount_tmpfs() {
|
do_mount_tmpfs() {
|
||||||
calc_tmpfs_size
|
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
|
boot_hook_add preinit_essential do_mount_procfs
|
||||||
|
|
|
@ -27,7 +27,6 @@ preinit_net_echo() {
|
||||||
[ "$pi_failsafe_net_message" = "true" ] &&
|
[ "$pi_failsafe_net_message" = "true" ] &&
|
||||||
[ "$pi_preinit_no_failsafe_netmsg" != "y" ]
|
[ "$pi_preinit_no_failsafe_netmsg" != "y" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
} && netmsg $pi_broadcast "$1"
|
} && netmsg $pi_broadcast "$1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,11 +10,11 @@ do_move_devtmpfs() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_mount_devfs() {
|
do_mount_devfs() {
|
||||||
mount devfs /dev -t devfs
|
mount -t devfs devfs /dev
|
||||||
}
|
}
|
||||||
|
|
||||||
do_mount_hotplug() {
|
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() {
|
do_mount_udev() {
|
||||||
|
|
|
@ -7,7 +7,7 @@ init_devpts() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_mount_devpts() {
|
do_mount_devpts() {
|
||||||
mount devpts /dev/pts -t devpts
|
mount -t devpts devpts /dev/pts
|
||||||
}
|
}
|
||||||
|
|
||||||
boot_hook_add preinit_essential init_devpts
|
boot_hook_add preinit_essential init_devpts
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
do_mount_root() {
|
do_mount_root() {
|
||||||
boot_run_hook preinit_mount_root
|
boot_run_hook preinit_mount_root
|
||||||
}
|
}
|
||||||
|
|
||||||
boot_hook_add preinit_main do_mount_root
|
boot_hook_add preinit_main do_mount_root
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue