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: v14.07~2394
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=a91d911f7d6c10dc1baeef1e6d9f422abebb3269;p=openwrt-github%2F.git

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

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

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

diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index bcd169034b..b3121789e0 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" ]
 	],
 ]