diff options
| author | Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr> | 2011-02-01 16:37:53 +0000 |
|---|---|---|
| committer | Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr> | 2011-02-01 16:37:53 +0000 |
| commit | 202a7b3712fc195a0d1795a4fe401b0fded7bc77 (patch) | |
| tree | c3a7a893effe6ccfbb640d09e6a27d18c8d307a4 /package/base-files/files | |
| parent | bc043c24b1065d977160256a34a7f0f3cf03c65d (diff) | |
| download | upstream-202a7b3712fc195a0d1795a4fe401b0fded7bc77.tar.gz upstream-202a7b3712fc195a0d1795a4fe401b0fded7bc77.tar.bz2 upstream-202a7b3712fc195a0d1795a4fe401b0fded7bc77.zip | |
[package] hotplug2: Use stricter matching for rule regular expressions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files')
| -rw-r--r-- | package/base-files/files/etc/hotplug2-common.rules | 13 | ||||
| -rw-r--r-- | package/base-files/files/etc/hotplug2-init.rules | 2 |
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 } |