X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dd98a11a9c1f4cdf345acbafbaca3dda9bfbcfa4..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/base-files/files/etc/hotplug2-common.rules

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index 0487ce9df..a96a8fa76 100644
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -4,31 +4,32 @@
 # 	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$|^tty|^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) {
+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
 }
 
@@ -36,12 +37,12 @@ DEVICENAME == device-mapper {
 	makedev /dev/mapper/control 0600
 }
 
-
 DEVPATH is set {
 	makedev /dev/%DEVICENAME% 0644
 }
 
 FIRMWARE is set, ACTION == add {
+	exec /sbin/hotplug-call firmware
 	load-firmware /lib/firmware
 	next-event
 }