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=101d4512fb798051d1413e20f730bce15a926bf0;hp=0487ce9dfba8232764acede3851df09840053752;hb=f91347ab62ef9458dcb6dea9c1e9aa6c135fb80d;hpb=ff6c97a7cfcd4ac4a431e0113a88bbca65cfeb97

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index 0487ce9dfb..101d4512fb 100644
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -4,44 +4,54 @@
 # 	exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%"
 # }
 
-DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio|hvc) {
+$include /etc/hotplug2-platform.rules
+
+DEVICENAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
 	makedev /dev/%DEVICENAME% 0666
 	next-event
 }
 
-DEVICENAME ~~ (tun|tap[0-9]) {
+DEVICENAME ~~ (^tun|^tap[0-9]$) {
 	makedev /dev/net/%DEVICENAME% 0644
 }
 
-DEVICENAME ~~ (ppp) {
-	makedev /dev/%DEVICENAME% 0600
-	next-event
-}
-
-DEVICENAME ~~ (controlC[0-9]|pcmC0D0*|timer) {
+DEVICENAME ~~ (^controlC[0-9]$|^pcmC[0-9]D[0-9]|^timer$) {
 	makedev /dev/snd/%DEVICENAME% 0644
 	next-event
 }
 
-DEVICENAME ~~ (lp[0-9]) {
+DEVICENAME ~~ ^lp[0-9]$ {
 	makedev /dev/%DEVICENAME% 0644
 	next-event
 }
 
-DEVPATH is set, SUBSYSTEM ~~ (input) {
+DEVPATH is set, SUBSYSTEM == input {
 	makedev /dev/input/%DEVICENAME% 0644
 }
 
 DEVICENAME == device-mapper {
 	makedev /dev/mapper/control 0600
+	next-event
 }
 
-
-DEVPATH is set {
+ACTION == add, DEVPATH is set {
 	makedev /dev/%DEVICENAME% 0644
 }
 
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^tty {
+	chmod 0666 /dev/%DEVICENAME%
+}
+
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^ppp {
+	chmod 0600 /dev/%DEVICENAME%
+}
+
+ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
+	remove /dev/%DEVICENAME%
+}
+
 FIRMWARE is set, ACTION == add {
+	exec /sbin/hotplug-call firmware
 	load-firmware /lib/firmware
 	next-event
 }