diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-12-01 17:08:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-12-01 17:08:04 +0000 |
| commit | 8422957baeb090c845891c4db94c3327de2e1c06 (patch) | |
| tree | dbfae56b1d14c752ba331633f8ebf26e4e6edbc6 | |
| parent | 3eb49f8d349422996cfff6a6f0c8c7026890c1e4 (diff) | |
| download | upstream-8422957baeb090c845891c4db94c3327de2e1c06.tar.gz upstream-8422957baeb090c845891c4db94c3327de2e1c06.tar.bz2 upstream-8422957baeb090c845891c4db94c3327de2e1c06.zip | |
refactor hotplug2 rules, make sure that the default button rule is only used during the init (should fix #2772)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9644 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/files/etc/hotplug2-common.rules | 35 | ||||
| -rw-r--r-- | package/base-files/files/etc/hotplug2-init.rules | 36 | ||||
| -rw-r--r-- | package/hotplug2/files/hotplug2.rules | 2 |
3 files changed, 37 insertions, 36 deletions
diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules new file mode 100644 index 0000000000..ed785e3b1c --- /dev/null +++ b/package/base-files/files/etc/hotplug2-common.rules @@ -0,0 +1,35 @@ + +DEVICENAME ~~ (null|full|ptmx|tty|zero) { + nothrottle + makedev /dev/%DEVICENAME% 0666 + next +} + +DEVICENAME ~~ (tun|tap[0-9]) { + nothrottle + makedev /dev/net/%DEVICENAME% 0644 + next +} + +DEVICENAME ~~ (ppp) { + nothrottle + makedev /dev/%DEVICENAME% 0600 + next +} + +DEVICENAME ~~ (controlC[0-9]|pcmC0D0*|timer) { + nothrottle + makedev /dev/snd/%DEVICENAME% 0644 + next +} + +DEVPATH is set { + nothrottle + makedev /dev/%DEVICENAME% 0644 +} + +FIRMWARE is set { + nothrottle + exec /sbin/hotplug-call firmware; + next +} diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules index 385af19193..429cdbbe16 100644 --- a/package/base-files/files/etc/hotplug2-init.rules +++ b/package/base-files/files/etc/hotplug2-init.rules @@ -1,38 +1,4 @@ - -DEVICENAME ~~ (null|full|ptmx|tty|zero) { - nothrottle - makedev /dev/%DEVICENAME% 0666 - next -} - -DEVICENAME ~~ (tun|tap[0-9]) { - nothrottle - makedev /dev/net/%DEVICENAME% 0644 - next -} - -DEVICENAME ~~ (ppp) { - nothrottle - makedev /dev/%DEVICENAME% 0600 - next -} - -DEVICENAME ~~ (controlC[0-9]|pcmC0D0*|timer) { - nothrottle - makedev /dev/snd/%DEVICENAME% 0644 - next -} - -DEVPATH is set { - nothrottle - makedev /dev/%DEVICENAME% 0644 -} - -FIRMWARE is set { - nothrottle - exec /sbin/hotplug-call firmware; - next -} +$include /etc/hotplug2-common.rules SUBSYSTEM ~~ button { exec kill -USR1 1 ; diff --git a/package/hotplug2/files/hotplug2.rules b/package/hotplug2/files/hotplug2.rules index 8429857824..1f3a444151 100644 --- a/package/hotplug2/files/hotplug2.rules +++ b/package/hotplug2/files/hotplug2.rules @@ -1,4 +1,4 @@ -$include /etc/hotplug2-init.rules +$include /etc/hotplug2-common.rules SUBSYSTEM ~~ (net|button|usb) { exec /sbin/hotplug-call %SUBSYSTEM%; |