[package] hotplug2: Use stricter matching for rule regular expressions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25282 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Vasilis Tsiligiannis 2011-02-01 16:37:53 +00:00
parent bc043c24b1
commit 202a7b3712
4 changed files with 12 additions and 13 deletions

View File

@ -4,31 +4,31 @@
# exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%" # 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 makedev /dev/%DEVICENAME% 0666
next-event next-event
} }
DEVICENAME ~~ (tun|tap[0-9]) { DEVICENAME ~~ (^tun|^tap[0-9]$) {
makedev /dev/net/%DEVICENAME% 0644 makedev /dev/net/%DEVICENAME% 0644
} }
DEVICENAME ~~ (ppp) { DEVICENAME ~~ ^ppp {
makedev /dev/%DEVICENAME% 0600 makedev /dev/%DEVICENAME% 0600
next-event next-event
} }
DEVICENAME ~~ (controlC[0-9]|pcmC0D0*|timer) { DEVICENAME ~~ (^controlC[0-9]$|^pcmC0D0|^timer$) {
makedev /dev/snd/%DEVICENAME% 0644 makedev /dev/snd/%DEVICENAME% 0644
next-event next-event
} }
DEVICENAME ~~ (lp[0-9]) { DEVICENAME ~~ ^lp[0-9]$ {
makedev /dev/%DEVICENAME% 0644 makedev /dev/%DEVICENAME% 0644
next-event next-event
} }
DEVPATH is set, SUBSYSTEM ~~ (input) { DEVPATH is set, SUBSYSTEM == input {
makedev /dev/input/%DEVICENAME% 0644 makedev /dev/input/%DEVICENAME% 0644
} }
@ -36,7 +36,6 @@ DEVICENAME == device-mapper {
makedev /dev/mapper/control 0600 makedev /dev/mapper/control 0600
} }
DEVPATH is set { DEVPATH is set {
makedev /dev/%DEVICENAME% 0644 makedev /dev/%DEVICENAME% 0644
} }

View File

@ -1,5 +1,5 @@
$include /etc/hotplug2-common.rules $include /etc/hotplug2-common.rules
SUBSYSTEM ~~ button { SUBSYSTEM == button {
exec kill -USR1 1 exec kill -USR1 1
} }

View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hotplug2 PKG_NAME:=hotplug2
PKG_REV:=201 PKG_REV:=201
PKG_VERSION:=$(PKG_REV) PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_PROTO:=svn PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_VERSION:=$(PKG_REV)

View File

@ -1,10 +1,10 @@
$include /etc/hotplug2-common.rules $include /etc/hotplug2-common.rules
SUBSYSTEM ~~ (net|input|button|usb|platform|ieee1394|block|atm) { SUBSYSTEM ~~ (^net$|^input$|^button$|^usb$|^platform$|^ieee1394$|^block$|^atm$) {
exec /sbin/hotplug-call %SUBSYSTEM% exec /sbin/hotplug-call %SUBSYSTEM%
} }
DEVICENAME ~~ (watchdog) { DEVICENAME == watchdog {
exec /sbin/watchdog -t 5 /dev/watchdog exec /sbin/watchdog -t 5 /dev/watchdog
next next-event
} }