qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Do not overload mount-call - trying to reduce confusion

Browse Source 
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh

/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34792 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mirko
2012-12-19 16:07:46 +00:00
parent c577d7187d
commit 53edda1e36
19 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/preinit/10_check_for_mtd
View File

@@ -5,7 +5,7 @@
mount_no_mtd() {
mtd unlock rootfs
mount -o remount,rw /dev/root /
mount -o noatime,remount,rw /dev/root /
}
check_for_mtd() {

6
package/base-files/files/lib/preinit/10_essential_fs
View File

@@ -3,11 +3,11 @@
# Copyright (C) 2010 Vertical Communications
do_mount_procfs() {
mount -t proc proc /proc
mount -o noatime -t proc proc /proc
}
do_mount_sysfs() {
mount -t sysfs sysfs /sys
mount -o noatime -tsysfs sysfs /sys
}
calc_tmpfs_size() {
@@ -16,7 +16,7 @@ calc_tmpfs_size() {
do_mount_tmpfs() {
calc_tmpfs_size
mount -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777 tmpfs /tmp
mount -o noatime -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777 tmpfs /tmp
}
boot_hook_add preinit_essential do_mount_procfs

8
package/base-files/files/lib/preinit/20_device_fs_mount
View File

@@ -6,19 +6,19 @@ do_move_devtmpfs() {
local mnt="$(grep devtmpfs /proc/mounts)"
mnt="${mnt#* }"; mnt="${mnt%% *}"
[ "$mnt" = "/dev" ] || mount -o move "$mnt" /dev
[ "$mnt" = "/dev" ] || mount -o noatime,move "$mnt" /dev
}
do_mount_devfs() {
mount -t devfs devfs /dev
mount -o noatime -t devfs devfs /dev
}
do_mount_hotplug() {
mount -t tmpfs -o mode=0755,size=512K tmpfs /dev
mount -t tmpfs -o noatime,mode=0755,size=512K tmpfs /dev
}
do_mount_udev() {
mount -n -t tmpfs -o mode=0755 udev /dev
mount -n -t tmpfs -o noatime,mode=0755 udev /dev
}
choose_device_fs() {

2
package/base-files/files/lib/preinit/40_mount_devpts
View File

@@ -7,7 +7,7 @@ init_devpts() {
}
do_mount_devpts() {
mount -t devpts devpts /dev/pts
mount -o noatime -t devpts devpts /dev/pts
}
boot_hook_add preinit_essential init_devpts

2
package/base-files/files/lib/preinit/40_mount_jffs2
View File

@@ -4,7 +4,7 @@
find_mount_jffs2() {
mkdir -p /tmp/overlay
mount "$(find_mtd_part rootfs_data)" /tmp/overlay -t jffs2
mount -o noatime -t jffs2 "$(find_mtd_part rootfs_data)" /tmp/overlay
mtd -qq unlock rootfs_data
}

2
package/base-files/files/lib/preinit/70_pivot_jffs2_root
View File

@@ -5,7 +5,7 @@
rootfs_pivot() {
check_skip || jffs2_not_mounted || {
echo "switching to jffs2"
mount -o move /tmp/overlay /overlay 2>&-
mount -o noatime,move /tmp/overlay /overlay 2>&-
fopivot /overlay /rom && pi_mount_skip_next=true
}
}