aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-12-19 16:07:46 +0000
committerMirko Vogt <mirko@openwrt.org>2012-12-19 16:07:46 +0000
commit439a869090282f229cf0edb41cc2d6e94f02b5c2 (patch)
tree566a9d008c55d34f6acf6734d220dcd0a9490177 /target
parentec9ce7e0890276486776a1d0862f0e6ce7ede577 (diff)
downloadupstream-439a869090282f229cf0edb41cc2d6e94f02b5c2.tar.gz
upstream-439a869090282f229cf0edb41cc2d6e94f02b5c2.tar.bz2
upstream-439a869090282f229cf0edb41cc2d6e94f02b5c2.zip
Do not overload mount-call - trying to reduce confusion
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'. SVN-Revision: 34792
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm2
-rwxr-xr-xtarget/linux/generic/base-files/init24
-rw-r--r--target/linux/x86/base-files/lib/preinit/15_essential_fs_x862
-rw-r--r--target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x864
-rw-r--r--target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs2
5 files changed, 16 insertions, 18 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
index 923c98fd49..4ca445623c 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
@@ -1,5 +1,5 @@
#!/bin/sh
do_mount_procfs() {
- mount none /proc -t proc
+ mount -o noatime none /proc -t proc
}
diff --git a/target/linux/generic/base-files/init b/target/linux/generic/base-files/init
index 5e4fbaec36..470576156b 100755
--- a/target/linux/generic/base-files/init
+++ b/target/linux/generic/base-files/init
@@ -9,14 +9,14 @@ set_state init
echo "- init -"
[ -n "$SWITCH_ROOT_TMPFS" ] && {
- mount none /mnt -t tmpfs
+ mount -o noatime none /mnt -t tmpfs
( cd /; find -xdev -type d ) | ( cd /mnt; xargs mkdir -p )
find / \! -type d -xdev | tar -cT /proc/self/fd/0 | tar -xC /mnt
mkdir /mnt/proc /mnt/dev /mnt/tmp /mnt/sys
- mount -o move /proc /mnt/proc
- mount -o move /dev /mnt/dev
- mount -o move /tmp /mnt/tmp
- mount -o move /sys /mnt/sys
+ mount -o noatime,move /proc /mnt/proc
+ mount -o noatime,move /dev /mnt/dev
+ mount -o noatime,move /tmp /mnt/tmp
+ mount -o noatime,move /sys /mnt/sys
rm -rf /proc /dev /tmp /sys
exec switch_root -c /dev/console /mnt /sbin/init
}
@@ -60,7 +60,7 @@ done
COUNTER=0
while [ $COUNTER -lt 10 ]; do
sleep 1
- mount $rootfs /mnt
+ mount -o noatime $rootfs /mnt
[ $? -eq "0" ] && let COUNTER=100;
let COUNTER=COUNTER+1
done
@@ -84,12 +84,12 @@ done
unset rootfs
-mount -o move /proc /mnt/proc
-mount -o move /dev /mnt/dev
-mount -o move /dev/pts /mnt/dev/pts
-mount -o move /tmp /mnt/tmp
-mount -o move /sys /mnt/sys
-mount none /tmp -t tmpfs
+mount -o noatime,move /proc /mnt/proc
+mount -o noatime,move /dev /mnt/dev
+mount -o noatime,move /dev/pts /mnt/dev/pts
+mount -o noatime,move /tmp /mnt/tmp
+mount -o noatime,move /sys /mnt/sys
+mount -o noatime none /tmp -t tmpfs
killall -q hotplug2
exec switch_root -c /dev/console /mnt /sbin/init
diff --git a/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 b/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
index ba22849d1e..5d5453093f 100644
--- a/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
+++ b/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86
@@ -3,6 +3,6 @@
# Copyright (C) 2010 Vertical Communications
do_mount_procfs() {
- mount -t proc none /proc
+ mount -o noatime -t proc none /proc
}
diff --git a/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86 b/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
index be342433d2..e4a380fd5f 100644
--- a/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
+++ b/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
@@ -3,7 +3,5 @@
# Copyright (C) 2010 Vertical Communications
do_mount_procfs() {
- mount -t proc none /proc
+ mount -o noatime -t proc none /proc
}
-
-
diff --git a/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
index 7eb8bf7958..7b0760516e 100644
--- a/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
+++ b/target/linux/x86/xen_domu/base-files/lib/preinit/45_mount_xenfs
@@ -4,7 +4,7 @@
do_mount_xenfs() {
[ -f /etc/modules.d/??-xenfs ] && {
insmod $(cat /etc/modules.d/??-xenfs)
- mount none /proc/xen -t xenfs
+ mount -o noatime none /proc/xen -t xenfs
}
}