base-files: Modernize hotplug2 rules (#11368)

SVN-Revision: 32711

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index a1d07d39972e01fdac0535687a400aa334be7307..c284f8f3fe2c08db0afb09e4b7d11c3d1ef4cb3e 100644 (file)
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -1,53 +1,35 @@
 
 # uncomment me to log hotplug events
 # DEVPATH is set {
-#      exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%"
+#      exec logger -s -t hotplug -p daemon.info "name=%DEVNAME%, path=%DEVPATH%"
 # }
 
 $include /etc/hotplug2-platform.rules
 
-DEVICENAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
-       makedev /dev/%DEVICENAME% 0666
+DEVNAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
+       makedev /dev/%DEVNAME% 0666
        next-event
 }
 
-DEVICENAME ~~ (^tun|^tap[0-9]$) {
-       makedev /dev/net/%DEVICENAME% 0644
-}
-
-DEVICENAME ~~ (^controlC[0-9]$|^pcmC[0-9]D[0-9]|^timer$) {
-       makedev /dev/snd/%DEVICENAME% 0644
-       next-event
-}
-
-DEVICENAME ~~ ^lp[0-9]$ {
-       makedev /dev/%DEVICENAME% 0644
-       next-event
-}
-
-DEVPATH is set, SUBSYSTEM == input {
-       makedev /dev/input/%DEVICENAME% 0644
-}
-
-DEVICENAME == device-mapper {
-       makedev /dev/mapper/control 0600
+DEVNAME == mapper/control {
+       makedev /dev/%DEVNAME% 0600
        next-event
 }
 
 ACTION == add, DEVPATH is set {
-       makedev /dev/%DEVICENAME% 0644
+       makedev /dev/%DEVNAME% 0644
 }
 
-ACTION == add, DEVPATH is set, DEVICENAME ~~ ^tty {
-       chmod 0666 /dev/%DEVICENAME%
+ACTION == add, DEVPATH is set, DEVNAME ~~ ^tty {
+       chmod 0666 /dev/%DEVNAME%
 }
 
-ACTION == add, DEVPATH is set, DEVICENAME ~~ ^ppp {
-       chmod 0600 /dev/%DEVICENAME%
+ACTION == add, DEVPATH is set, DEVNAME ~~ ^ppp {
+       chmod 0600 /dev/%DEVNAME%
 }
 
 ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
-       remove /dev/%DEVICENAME%
+       remove /dev/%DEVNAME%
 }
 
 FIRMWARE is set, ACTION == add {