Merge trunk into realtek-unstable

Conflicts:
	Config.in
	feeds.conf.default
	package/base-files/files/etc/hotplug2-common.rules
	package/network/config/netifd/files/etc/init.d/network

1 files changed, 61 insertions, 0 deletions

diff --git a/package/base-files/files.old/etc/hotplug2-common.rules b/package/base-files/files.old/etc/hotplug2-common.rules
new file mode 100644
index 000000000..a1d07d399
--- /dev/null
+++ b/package/base-files/files.old/etc/hotplug2-common.rules
@@ -0,0 +1,61 @@
+
+# uncomment me to log hotplug events
+# DEVPATH is set {
+# 	exec logger -s -t hotplug -p daemon.info "name=%DEVICENAME%, path=%DEVPATH%"
+# }
+
+$include /etc/hotplug2-platform.rules
+
+DEVICENAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
+	makedev /dev/%DEVICENAME% 0666
+	next-event
+}
+
+DEVICENAME ~~ (^tun|^tap[0-9]$) {
+	makedev /dev/net/%DEVICENAME% 0644
+}
+
+DEVICENAME ~~ (^controlC[0-9]$|^pcmC[0-9]D[0-9]|^timer$) {
+	makedev /dev/snd/%DEVICENAME% 0644
+	next-event
+}
+
+DEVICENAME ~~ ^lp[0-9]$ {
+	makedev /dev/%DEVICENAME% 0644
+	next-event
+}
+
+DEVPATH is set, SUBSYSTEM == input {
+	makedev /dev/input/%DEVICENAME% 0644
+}
+
+DEVICENAME == device-mapper {
+	makedev /dev/mapper/control 0600
+	next-event
+}
+
+ACTION == add, DEVPATH is set {
+	makedev /dev/%DEVICENAME% 0644
+}
+
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^tty {
+	chmod 0666 /dev/%DEVICENAME%
+}
+
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^ppp {
+	chmod 0600 /dev/%DEVICENAME%
+}
+
+ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
+	remove /dev/%DEVICENAME%
+}
+
+FIRMWARE is set, ACTION == add {
+	exec /sbin/hotplug-call firmware
+	load-firmware /lib/firmware
+	next-event
+}
+
+SUBSYSTEM == platform {
+	exec /sbin/hotplug-call %SUBSYSTEM%
+}