diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 20:31:53 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 20:31:53 +0000 |
commit | ae39d6a370ebb0171bd666a22159b70a2e921877 (patch) | |
tree | d01574d8952ea12da4e829c3c811e57382a1be17 /package/base-files/files/etc | |
parent | 7c5ca4e5dedaaf8480fdd6a8eb1ea6a0e89d0229 (diff) | |
download | master-187ad058-ae39d6a370ebb0171bd666a22159b70a2e921877.tar.gz master-187ad058-ae39d6a370ebb0171bd666a22159b70a2e921877.tar.bz2 master-187ad058-ae39d6a370ebb0171bd666a22159b70a2e921877.zip |
nuke mdev and replace it with hotplug2 :)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6512 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/etc')
-rwxr-xr-x | package/base-files/files/etc/functions.sh | 2 | ||||
-rw-r--r-- | package/base-files/files/etc/hotplug2.rules | 7 | ||||
-rwxr-xr-x | package/base-files/files/etc/init.d/boot | 7 | ||||
-rw-r--r-- | package/base-files/files/etc/mdev.conf | 5 |
4 files changed, 13 insertions, 8 deletions
diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh index c29ae772ac..4d84bb81e0 100755 --- a/package/base-files/files/etc/functions.sh +++ b/package/base-files/files/etc/functions.sh @@ -12,7 +12,7 @@ _C=0 NO_EXPORT=1 hotplug_dev() { - env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net + env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net } append() { diff --git a/package/base-files/files/etc/hotplug2.rules b/package/base-files/files/etc/hotplug2.rules new file mode 100644 index 0000000000..d2a931adcf --- /dev/null +++ b/package/base-files/files/etc/hotplug2.rules @@ -0,0 +1,7 @@ +DEVPATH is set { + makedev /dev/%DEVICENAME% 0644 +} + +MODALIAS is set { + exec /sbin/modprobe -q %MODALIAS% ; +} diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index db7ec8cc3a..ed5e7d8ba5 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -20,8 +20,11 @@ start() { # manually trigger hotplug before loading modules for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do - /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net + /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net done - + + /sbin/hotplug2 --persistent & + echo /sbin/hotplug-call > /proc/sys/kernel/hotplug + load_modules /etc/modules.d/* } diff --git a/package/base-files/files/etc/mdev.conf b/package/base-files/files/etc/mdev.conf deleted file mode 100644 index 89355830f0..0000000000 --- a/package/base-files/files/etc/mdev.conf +++ /dev/null @@ -1,5 +0,0 @@ -null 0:0 777 -zero 0:0 666 -console 0:5 0600 -tty 0:5 0660 -ttyS* 0:20 640 |