diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-05-05 18:33:18 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-05 18:33:18 +0000 |
| commit | ca7a8156029b94f9fe0e9d78a2502c0b0db98567 (patch) | |
| tree | dbb58fde5a662952714b8c7221c94e9ea1c7e445 /target/linux | |
| parent | 341b6afd554369bcd700dd505210955d521e9ee9 (diff) | |
| download | upstream-ca7a8156029b94f9fe0e9d78a2502c0b0db98567.tar.gz upstream-ca7a8156029b94f9fe0e9d78a2502c0b0db98567.tar.bz2 upstream-ca7a8156029b94f9fe0e9d78a2502c0b0db98567.zip | |
use hotplug2 for serializing hotplug events on 2.6
SVN-Revision: 7097
Diffstat (limited to 'target/linux')
| -rwxr-xr-x | target/linux/brcm-2.4/base-files/default/etc/preinit | 6 | ||||
| -rw-r--r-- | target/linux/brcm-2.4/config/default | 1 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-template | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit b/target/linux/brcm-2.4/base-files/default/etc/preinit index 11d9342796..4513d6382d 100755 --- a/target/linux/brcm-2.4/base-files/default/etc/preinit +++ b/target/linux/brcm-2.4/base-files/default/etc/preinit @@ -31,14 +31,16 @@ if grep devfs /proc/filesystems > /dev/null; then mount none /dev -t devfs M0=/dev/pty/m0 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 - /sbin/hotplug2 --no-persistent --coldplug --max_children 1 + /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules M0=/dev/ptmx M1=/dev/ptmx + HOTPLUG= fi mkdir -p /dev/pts mount none /dev/pts -t devpts @@ -86,7 +88,7 @@ eval ${FAILSAFE:+failsafe} lock -w /tmp/.failsafe set_state preinit -echo /sbin/hotplug-call > /proc/sys/kernel/hotplug +echo "$HOTPLUG" > /proc/sys/kernel/hotplug ifconfig $ifname 0.0.0.0 down diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config/default index 60355f89da..2828170162 100644 --- a/target/linux/brcm-2.4/config/default +++ b/target/linux/brcm-2.4/config/default @@ -175,7 +175,6 @@ CONFIG_MSDOS_FS=m CONFIG_MTD_BCM947XX=y CONFIG_MTD_CFI_SSTSTD=y CONFIG_MTD_SFLASH=y -# CONFIG_MTD_SPLIT_ROOTFS is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_NE3210 is not set diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template index 92d1d29601..a35715eca9 100644 --- a/target/linux/generic-2.6/config-template +++ b/target/linux/generic-2.6/config-template @@ -366,6 +366,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_LIMIT=m CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_RT=m |