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

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

package/base-files/files/etc/hotplug2-common.rules

+
+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
+}

package/base-files/files/etc/hotplug2-init.rules

-
-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 ;

package/hotplug2/files/hotplug2.rules

-$include /etc/hotplug2-init.rules
+$include /etc/hotplug2-common.rules
 
 SUBSYSTEM ~~ (net|button|usb) {
 	exec /sbin/hotplug-call %SUBSYSTEM%;