mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-23 04:15:51 +03:00
mount_root should only mount the root
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7418 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
3bc4300361
commit
3fef5a6916
@ -11,13 +11,50 @@ failsafe() {
|
|||||||
mount none /proc -t proc
|
mount none /proc -t proc
|
||||||
mount none /sys -t sysfs
|
mount none /sys -t sysfs
|
||||||
|
|
||||||
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
|
size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
|
||||||
|
mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
|
||||||
|
|
||||||
set_state preinit
|
if grep devfs /proc/filesystems > /dev/null; then
|
||||||
|
mount none /dev -t devfs
|
||||||
|
M0=/dev/pty/m0
|
||||||
|
M1=/dev/pty/m1
|
||||||
|
HOTPLUG=/sbin/hotplug-call
|
||||||
|
else
|
||||||
|
mount -t tmpfs tmpfs /dev -o size=512K
|
||||||
|
mknod /dev/console c 5 1
|
||||||
|
mkdir /dev/shm
|
||||||
|
/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
|
||||||
|
M0=/dev/ptmx
|
||||||
|
M1=/dev/ptmx
|
||||||
|
HOTPLUG=
|
||||||
|
fi
|
||||||
|
|
||||||
mount_root ${FAILSAFE:+failsafe}
|
mkdir -p /dev/pts /dev/shm
|
||||||
|
mount none /dev/pts -t devpts
|
||||||
|
|
||||||
eval ${FAILSAFE:+failsafe}
|
# the shell really doesn't like having stdin/out closed
|
||||||
lock -w /tmp/.failsafe
|
# that's why we use /dev/pty/m0 and m1 as replacement
|
||||||
|
# for /dev/console if there's no serial console available
|
||||||
|
dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
|
||||||
|
M0=/dev/console
|
||||||
|
M1=/dev/console
|
||||||
|
}
|
||||||
|
|
||||||
|
exec <$M0 >$M1 2>&0
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "- preinit -"
|
||||||
|
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
|
||||||
|
set_state preinit
|
||||||
|
|
||||||
|
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
|
||||||
|
|
||||||
|
eval ${FAILSAFE:+failsafe}
|
||||||
|
lock -w /tmp/.failsafe
|
||||||
|
|
||||||
|
mount_root
|
||||||
|
|
||||||
|
echo "- init -"
|
||||||
|
} | tee /tmp/preinit.log
|
||||||
|
|
||||||
exec /sbin/init
|
exec /sbin/init
|
||||||
|
@ -2,55 +2,24 @@
|
|||||||
# Copyright (C) 2006 OpenWrt.org
|
# Copyright (C) 2006 OpenWrt.org
|
||||||
. /etc/functions.sh
|
. /etc/functions.sh
|
||||||
|
|
||||||
size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
|
|
||||||
mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
|
|
||||||
|
|
||||||
if grep devfs /proc/filesystems > /dev/null; then
|
|
||||||
mount none /dev -t devfs
|
|
||||||
M0=/dev/pty/m0
|
|
||||||
M1=/dev/pty/m1
|
|
||||||
HOTPLUG=/sbin/hotplug-call
|
|
||||||
else
|
|
||||||
mount -t tmpfs tmpfs /dev -o size=512K
|
|
||||||
mknod /dev/console c 5 1
|
|
||||||
mkdir /dev/shm
|
|
||||||
/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
|
|
||||||
M0=/dev/ptmx
|
|
||||||
M1=/dev/ptmx
|
|
||||||
HOTPLUG=
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p /dev/pts /dev/shm
|
|
||||||
mount none /dev/pts -t devpts
|
|
||||||
|
|
||||||
# the shell really doesn't like having stdin/out closed
|
|
||||||
# that's why we use /dev/pty/m0 and m1 as replacement
|
|
||||||
# for /dev/console if there's no serial console available
|
|
||||||
dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null || \
|
|
||||||
exec <$M0 >$M1 2>&0
|
|
||||||
|
|
||||||
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
|
|
||||||
|
|
||||||
jffs2_ready () {
|
jffs2_ready () {
|
||||||
mtdpart="$(find_mtd_part rootfs_data)"
|
mtdpart="$(find_mtd_part rootfs_data)"
|
||||||
magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
|
magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
|
||||||
[ "$magic" != "deadc0de" ]
|
[ "$magic" != "deadc0de" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
[ failsafe != "$1" ] && {
|
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
||||||
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
. /bin/firstboot
|
||||||
. /bin/firstboot
|
mtd unlock rootfs_data
|
||||||
mtd unlock rootfs_data
|
jffs2_ready && {
|
||||||
jffs2_ready && {
|
echo "switching to jffs2"
|
||||||
echo "switching to jffs2"
|
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
|
||||||
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
|
fopivot /jffs /rom
|
||||||
fopivot /jffs /rom
|
|
||||||
} || {
|
|
||||||
echo "jffs2 not ready yet; using ramdisk"
|
|
||||||
ramoverlay
|
|
||||||
}
|
|
||||||
} || {
|
} || {
|
||||||
mtd unlock rootfs
|
echo "jffs2 not ready yet; using ramdisk"
|
||||||
mount -o remount,rw /dev/root /
|
ramoverlay
|
||||||
}
|
}
|
||||||
|
} || {
|
||||||
|
mtd unlock rootfs
|
||||||
|
mount -o remount,rw /dev/root /
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user