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>
SVN-Revision: 9411

diff --git a/target/linux/generic-2.6/base-files/init b/target/linux/generic-2.6/base-files/init
index 9f595c0f9534c1ffe74d0d42478b92a0a15f0fd0..98002aba3db7e4b368fc3cf78b5d1e36c568bd78 100755 (executable)
--- 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