aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-04 20:31:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-04 20:31:53 +0000
commitae39d6a370ebb0171bd666a22159b70a2e921877 (patch)
treed01574d8952ea12da4e829c3c811e57382a1be17 /package/base-files
parent7c5ca4e5dedaaf8480fdd6a8eb1ea6a0e89d0229 (diff)
downloadupstream-ae39d6a370ebb0171bd666a22159b70a2e921877.tar.gz
upstream-ae39d6a370ebb0171bd666a22159b70a2e921877.tar.bz2
upstream-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')
-rwxr-xr-xpackage/base-files/files/etc/functions.sh2
-rw-r--r--package/base-files/files/etc/hotplug2.rules7
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot7
-rw-r--r--package/base-files/files/etc/mdev.conf5
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
-rwxr-xr-xpackage/base-files/files/sbin/hotplug-call (renamed from package/base-files/files/sbin/hotplug)2
-rwxr-xr-xpackage/base-files/files/sbin/ifdown2
-rwxr-xr-xpackage/base-files/files/sbin/mount_root2
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script2
9 files changed, 17 insertions, 14 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
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 95954bf15a..8a596874d4 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -157,7 +157,7 @@ setup_interface() {
done
}
- env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
+ env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
;;
dhcp)
# prevent udhcpc from starting more than once
diff --git a/package/base-files/files/sbin/hotplug b/package/base-files/files/sbin/hotplug-call
index 189cfee67c..b1b6f97b23 100755
--- a/package/base-files/files/sbin/hotplug
+++ b/package/base-files/files/sbin/hotplug-call
@@ -1,8 +1,6 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
-[ -x /sbin/mdev -a -n "$ACTION" -a -n "$DEVPATH" ] && /sbin/mdev "$@"
-
# bypass the normal hotplug path for firmware loading
# would otherwise cause problems with drivers like bcm43xx
[ "$1" = "firmware" -a "$ACTION" = "add" ] && {
diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 540c69f169..e00a4e38da 100755
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -21,7 +21,7 @@ config_get proto "$cfg" proto
config_get iface "$cfg" device
[ "$proto" = "static" ] && {
- env -i ACTION="ifdown" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
+ env -i ACTION="ifdown" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
}
# call interface stop handler
diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 9a87fadbaa..dd9d99d8e6 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -12,7 +12,7 @@ else
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
mkdir /dev/shm
- /sbin/mdev -s
+ /sbin/hotplug2 --no-persistent --coldplug
fi
mkdir -p /dev/pts
mount none /dev/pts -t devpts
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index f39d21ed8c..c723953566 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -14,7 +14,7 @@ hotplug_event() {
config_get proto $ifc proto
[ "$proto" = "dhcp" ] || continue
- env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug iface
+ env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
done
}