hotplug2 update - include hotplug2-init.rules from hotplug2.rules, fix permissions of various devices (fixes #2052)

SVN-Revision: 7892

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

@@ -1,12 +1,34 @@
+
+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*) {
+	nothrottle
+	makedev /dev/snd/%DEVICENAME% 0644
+	next
+}
+
 DEVPATH is set {
+	nothrottle
 	makedev /dev/%DEVICENAME% 0644
 }
 
+
 SUBSYSTEM ~~ button {
 	exec kill -USR1 1 ;
 }

package/hotplug2/Makefile

@@ -30,7 +30,7 @@ define Package/hotplug2/description
 Hotplug2 is a trivial replacement of some of the UDev functionality
 in a tiny pack, intended for Linux early userspace: Init RAM FS and InitRD.
 endef
-MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS) -DHAVE_RULES"
+MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS) -DHAVE_RULES -I."
 
 define Package/hotplug2/install
 	$(INSTALL_DIR) $(1)/etc

package/hotplug2/files/hotplug2.rules

@@ -1,20 +1,4 @@
-DEVICENAME ~~ (tun|tap[0-9]) {
+$include /etc/hotplug2-init.rules
-	nothrottle
-	makedev /dev/net/%DEVICENAME% 0644
-	next
-}
-
-DEVICENAME ~~ (controlC[0-9]|pcmC0D0*) {
-	nothrottle
-	makedev /dev/snd/%DEVICENAME% 0644
-	next
-}
-
-DEVPATH is set {
-	nothrottle
-	makedev /dev/%DEVICENAME% 0644
-}
-
 FIRMWARE is set {
 	nothrottle
 	exec /sbin/hotplug-call firmware;