summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-10-23 06:23:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-10-23 06:23:33 +0000
commit60084f42c73ad07a956162d471af2007d86201f6 (patch)
treedbc18ad6ba6a9fb385c52feb629177220ab4cd21 /target/linux
parent957fd804f10d8ab53eb12f5d562dee3878cacae6 (diff)
only do hotplug2 init if hotplug2 is present
The current /init script unconditionally does the initialisation for hotplug2, including mounting a new /dev. If hotplug2 isn't present, we end up with no device nodes. This change only does the hotplug2 init if hotplug2 is present, but always mounts /sys. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9411 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/generic-2.6/base-files/init5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/base-files/init b/target/linux/generic-2.6/base-files/init
index 9f595c0f95..98002aba3d 100755
--- a/target/linux/generic-2.6/base-files/init
+++ b/target/linux/generic-2.6/base-files/init
@@ -3,11 +3,12 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount none /proc -t proc
+mount none /sys -t sysfs
if grep devfs /proc/filesystems > /dev/null; then
mount none /dev -t devfs
-else
- mount -t sysfs none /sys
+
+elif [ -x /sbin/hotplug2 ]; then
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
mkdir /dev/pts