projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c7ab545
)
[package] hotplug2: Use stricter matching for rule regular expressions
author
Vasilis Tsiligiannis
<acinonyx@openwrt.gr>
Tue, 1 Feb 2011 16:37:53 +0000
(16:37 +0000)
committer
Vasilis Tsiligiannis
<acinonyx@openwrt.gr>
Tue, 1 Feb 2011 16:37:53 +0000
(16:37 +0000)
SVN-Revision: 25282
package/base-files/files/etc/hotplug2-common.rules
patch
|
blob
|
history
package/base-files/files/etc/hotplug2-init.rules
patch
|
blob
|
history
package/hotplug2/Makefile
patch
|
blob
|
history
package/hotplug2/files/hotplug2.rules
patch
|
blob
|
history
diff --git
a/package/base-files/files/etc/hotplug2-common.rules
b/package/base-files/files/etc/hotplug2-common.rules
index 0487ce9dfba8232764acede3851df09840053752..bd30e5563262488dc49b33f7ab97a010bd2ed64f 100644
(file)
--- 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%"
# }
# 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
}
makedev /dev/%DEVICENAME% 0666
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
next-event
}
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
}
makedev /dev/snd/%DEVICENAME% 0644
next-event
}
-DEVICENAME ~~
(lp[0-9])
{
+DEVICENAME ~~
^lp[0-9]$
{
makedev /dev/%DEVICENAME% 0644
next-event
}
makedev /dev/%DEVICENAME% 0644
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 {
makedev /dev/%DEVICENAME% 0644
}
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 e7dd0add3b144ef35bf7001f0e591228784fc832..f01169776642b9325b1227d5a55c5b5fb51a54e6 100644
(file)
--- 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
$include /etc/hotplug2-common.rules
-SUBSYSTEM
~~
button {
+SUBSYSTEM
==
button {
exec kill -USR1 1
}
exec kill -USR1 1
}
diff --git
a/package/hotplug2/Makefile
b/package/hotplug2/Makefile
index a4ff850ad9119387de813bec31ba0cc8ddba12be..de46332500e5b71ac91672cd2505fe0750df0dd9 100644
(file)
--- a/
package/hotplug2/Makefile
+++ b/
package/hotplug2/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-20
09
OpenWrt.org
+# Copyright (C) 2006-20
11
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-10,7
+10,7
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=hotplug2
PKG_REV:=201
PKG_VERSION:=$(PKG_REV)
PKG_NAME:=hotplug2
PKG_REV:=201
PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=
3
+PKG_RELEASE:=
4
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git
a/package/hotplug2/files/hotplug2.rules
b/package/hotplug2/files/hotplug2.rules
index 9800658983ad8b4aadaac313908b58fe26e0c10c..a7a4730105f81ad1b8137ac754ea4f4225b6a2ab 100644
(file)
--- a/
package/hotplug2/files/hotplug2.rules
+++ b/
package/hotplug2/files/hotplug2.rules
@@
-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
}
}