summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-22 19:22:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-22 19:22:05 +0000
commit263af2cd582c91c6d80c1a1820baef0d2c2fc1bd (patch)
treec16ab2c922633766e6ad5c920e79da4642978e6e /package
parent14537ae0c65e537b20512d6bd6c55c81ee0a6ab6 (diff)
This patch re-adds the udev and hotplug2 initialization fixes originally
present in /init but was removed when some code was moved from /init to /etc/preinit in rev 10870. This adds udev initialization and only handles hotplug2 initialization when hotplug2 is present. Signed-off-by: Yuji Mano <yuji.mano@am.sony.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10912 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/etc/preinit15
1 files changed, 12 insertions, 3 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index c24035ec3..ddbb2f33b 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -18,7 +18,7 @@ failsafe() {
}
mount proc /proc -t proc
-mount sysfs /sys -t sysfs
+mount sysfs /sys -t sysfs
size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
@@ -28,15 +28,24 @@ if grep devfs /proc/filesystems > /dev/null; then
M0=/dev/pty/m0
M1=/dev/pty/m1
HOTPLUG=/sbin/hotplug-call
-else
+
+elif [ -x /sbin/hotplug ]; then
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
- mkdir /dev/shm
/sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
/sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=
+
+elif [ -x /sbin/udevd ]; then
+ mount -n -t tmpfs -o mode=0755 udev /dev
+ /sbin/udevd --daemon
+ /sbin/udevtrigger
+ /sbin/udevsettle
+ M0=/dev/pty/ptmx
+ M1=/dev/pty/ptmx
+ HOTPLUG=
fi
mkdir -p /dev/pts /dev/shm