From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 19 Nov 2013 00:03:42 +0000 (+0000)
Subject: procd: emit tty events for ttyUSB* even when they come from the usb-serial subsystem
X-Git-Tag: reboot~8577
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c84a43cf40e9b7249d83810604830500a373d253;p=openwrt%2Fstaging%2Fblogic.git

procd: emit tty events for ttyUSB* even when they come from the usb-serial subsystem

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38862
---

diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index bcd169034b34..b3121789e0ac 100644
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -69,15 +69,18 @@
 		[ "exec", "/etc/rc.button/%BUTTON%" ]
 	],
 	[ "if",
-		[ "or",
+		[ "eq", "SUBSYSTEM",
+			[ "net", "input", "usb", "ieee1394", "block", "atm", "zaptel", "tty", "button" ]
+		],
+		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+	],
+	[ "if",
+		[ "and",
 			[ "eq", "SUBSYSTEM",
-				[ "net", "input", "usb", "ieee1394", "block", "atm", "zaptel", "button" ],
+				[ "tty", "usb-serial" ]
 			],
-			[ "and",
-				[ "eq", "SUBSYSTEM", "tty" ],
-				[ "regex", "DEVNAME", "^ttyUSB" ],
-			]
+			[ "regex", "DEVNAME", "^ttyUSB" ],
 		],
-		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+		[ "exec", "/sbin/hotplug-call", "tty" ]
 	],
 ]