summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-13 10:17:57 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-13 10:17:57 +0000
commit663c75c6b2009ca185380488221086ea7ac5aeb8 (patch)
treef35ab06b5458135eb7c362c445b44d97a1cd3502
parent6853d4d1ef87e8740a293d7c8e548099dfce5949 (diff)
Fix set_state preinit stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7200 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/etc/preinit3
-rwxr-xr-xpackage/base-files/files/sbin/mount_root3
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index b23508f55..34befe5ac 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -10,6 +10,9 @@ failsafe() {
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+mount -t proc none /proc
+mount -t sysfs none /sys
+
set_state preinit
mount_root ${FAILSAFE:+failsafe}
diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index a77a7f645..eac4ef396 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,8 +2,6 @@
# Copyright (C) 2006 OpenWrt.org
. /etc/functions.sh
-mount none /proc -t proc
-
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
@@ -13,7 +11,6 @@ if grep devfs /proc/filesystems > /dev/null; then
M1=/dev/pty/m1
HOTPLUG=/sbin/hotplug-call
else
- mount -t sysfs none /sys
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
mkdir /dev/shm