diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:46 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:46 +0000 |
| commit | fd18877418cf14f6bc2b413a238a3ca5f6d9ad94 (patch) | |
| tree | b94fb7ac00524d0705ef8265df341a2a596e7a20 /target/linux/generic/base-files | |
| parent | 667779e4f8fa3749d0867908c4bae53b0471e961 (diff) | |
| download | master-187ad058-fd18877418cf14f6bc2b413a238a3ca5f6d9ad94.tar.gz master-187ad058-fd18877418cf14f6bc2b413a238a3ca5f6d9ad94.tar.bz2 master-187ad058-fd18877418cf14f6bc2b413a238a3ca5f6d9ad94.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'.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34792 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/base-files')
| -rwxr-xr-x | target/linux/generic/base-files/init | 24 |
1 files changed, 12 insertions, 12 deletions
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 |