refactor hotplug2 rules, make sure that the default button rule is only used during...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9644 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
new file mode 100644 (file)
index 0000000..ed785e3
--- /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 385af19..429cdbb 100644 (file)
--- 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 8429857..1f3a444 100644 (file)
--- 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%;