X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Fhotplug2-common.rules;h=bd30e5563262488dc49b33f7ab97a010bd2ed64f;hp=3a9f4c5ded136e06b23471793e82890d22c1776a;hb=eec02add245c3c5229f16c50c9cfbd0b24c919e9;hpb=1a250e79efb30ae56a4962c48fe820aa0c20bacf

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index 3a9f4c5ded..bd30e55632 100644
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -1,40 +1,46 @@
 
-DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio) {
-	nothrottle
+# uncomment me to log hotplug events
+# DEVPATH is set {
+# 	exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%"
+# }
+
+DEVICENAME ~~ (^null$|^full$|^ptmx$|^tty|^zero$|^gpio|^hvc) {
 	makedev /dev/%DEVICENAME% 0666
-	next
+	next-event
 }
 
-DEVICENAME ~~ (tun|tap[0-9]) {
-	nothrottle
+DEVICENAME ~~ (^tun|^tap[0-9]$) {
 	makedev /dev/net/%DEVICENAME% 0644
-	next
 }
 
-DEVICENAME ~~ (ppp) {
-	nothrottle
+DEVICENAME ~~ ^ppp {
 	makedev /dev/%DEVICENAME% 0600
-	next
+	next-event
 }
 
-DEVICENAME ~~ (controlC[0-9]|pcmC0D0*|timer) {
-	nothrottle
+DEVICENAME ~~ (^controlC[0-9]$|^pcmC0D0|^timer$) {
 	makedev /dev/snd/%DEVICENAME% 0644
-	next
+	next-event
+}
+
+DEVICENAME ~~ ^lp[0-9]$ {
+	makedev /dev/%DEVICENAME% 0644
+	next-event
 }
 
-DEVPATH is set, SUBSYSTEM ~~ (input) {
-	nothrottle
+DEVPATH is set, SUBSYSTEM == input {
 	makedev /dev/input/%DEVICENAME% 0644
 }
 
+DEVICENAME == device-mapper {
+	makedev /dev/mapper/control 0600
+}
+
 DEVPATH is set {
-	nothrottle
 	makedev /dev/%DEVICENAME% 0644
 }
 
-FIRMWARE is set {
-	nothrottle
-	exec /sbin/hotplug-call firmware
-	next
+FIRMWARE is set, ACTION == add {
+	load-firmware /lib/firmware
+	next-event
 }