aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/etc
diff options
context:
space:
mode:
authorVasilis Tsiligiannis <acinonyx@openwrt.gr>2011-02-01 16:37:53 +0000
committerVasilis Tsiligiannis <acinonyx@openwrt.gr>2011-02-01 16:37:53 +0000
commit824331a5943c0acfbb7b1fc95116c77092660f1e (patch)
tree46afa59e1229d17ea071ec170b4ca5a66ac44679 /package/base-files/files/etc
parentbe8e23827ad7fb375bf4cd74c6e4eda994ab93f0 (diff)
downloadupstream-824331a5943c0acfbb7b1fc95116c77092660f1e.tar.gz
upstream-824331a5943c0acfbb7b1fc95116c77092660f1e.tar.bz2
upstream-824331a5943c0acfbb7b1fc95116c77092660f1e.zip
hotplug2: Use stricter matching for rule regular expressions
SVN-Revision: 25282
Diffstat (limited to 'package/base-files/files/etc')
-rw-r--r--package/base-files/files/etc/hotplug2-common.rules13
-rw-r--r--package/base-files/files/etc/hotplug2-init.rules2
2 files changed, 7 insertions, 8 deletions
diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index 0487ce9dfb..bd30e55632 100644
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -4,31 +4,31 @@
# exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%"
# }
-DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio|hvc) {
+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]$|^pcmC0D0|^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,7 +36,6 @@ DEVICENAME == device-mapper {
makedev /dev/mapper/control 0600
}
-
DEVPATH is set {
makedev /dev/%DEVICENAME% 0644
}
diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index e7dd0add3b..f011697766 100644
--- a/package/base-files/files/etc/hotplug2-init.rules
+++ b/package/base-files/files/etc/hotplug2-init.rules
@@ -1,5 +1,5 @@
$include /etc/hotplug2-common.rules
-SUBSYSTEM ~~ button {
+SUBSYSTEM == button {
exec kill -USR1 1
}