use hotplug2 for serializing hotplug events on 2.6

[openwrt.git] / package / base-files / files / sbin / mount_root

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 607877c..607c799 100755 (executable)
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -4,18 +4,37 @@
 
 mount none /proc -t proc
 size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
-mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 
-grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
-       mtd unlock rootfs
-       grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
-               . /bin/firstboot
-               echo "switching to jffs2"
-               mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
-               fopivot /jffs /rom
-       }
-} || mount -o remount,rw /dev/root /
+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
+else
+       mount -t tmpfs tmpfs /dev -o size=512K
+       mknod /dev/console c 5 1
+       exec >/dev/console </dev/console 2>&1
+fi
+mkdir /dev/shm
+if grep sysfs /proc/filesystems >/dev/null; then
+       mount -t sysfs none /sys
+       HOTPLUG=""
+       # use a minimal ruleset only for creating device nodes
+       /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
+else
+       HOTPLUG="/sbin/hotplug2-dnode"
+fi
+echo "$HOTPLUG" > /proc/sys/kernel/hotplug
 
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
-grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-
+
+[ failsafe != "$1" ] && {
+       grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
+               mtd unlock rootfs
+               grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
+                       . /bin/firstboot
+                       echo "switching to jffs2"
+                       mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
+                       fopivot /jffs /rom
+               }
+       } || mount -o remount,rw /dev/root /
+}