mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user