From: John Crispin <john@openwrt.org>
Date: Fri, 26 Feb 2016 08:35:43 +0000 (+0000)
Subject: procd: hotplug.json: allow passing hotplug events from all subsystems
X-Git-Tag: reboot~355
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f3c1e779364394a7e8f9f45ee824e0dff556cec;p=openwrt%2Fstaging%2Fnoltari.git

procd: hotplug.json: allow passing hotplug events from all subsystems

There are time that programs need to be notified of events from
subsystems that are not enumerated in the .json definition, e.g. QEMU
guest agent by default requires /dev/virtio-ports/org.qemu.guest_agent.0
which is a symlink to /dev/vportMpN from virtio-ports subsystem.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

SVN-Revision: 48799
---

diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index 516a122f0e..e2f1604542 100644
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -57,10 +57,6 @@
 			]
 		]
 	} ],
-	[ "if",
-		[ "eq", "SUBSYSTEM", "platform" ],
-		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
-	],
 	[ "if",
 		[ "and",
 			[ "has", "BUTTON" ],
@@ -68,19 +64,17 @@
 		],
 		[ "button", "/etc/rc.button/%BUTTON%" ]
 	],
-	[ "if",
-		[ "eq", "SUBSYSTEM",
-			[ "net", "input", "usb", "usbmisc", "ieee1394", "block", "atm", "zaptel", "tty", "button", "sound" ]
-		],
-		[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
-	],
 	[ "if",
 		[ "and",
 			[ "eq", "SUBSYSTEM", "usb-serial" ],
 			[ "regex", "DEVNAME",
 				[ "^ttyUSB", "^ttyACM" ]
-			],
+			]
 		],
-		[ "exec", "/sbin/hotplug-call", "tty" ]
+		[ "exec", "/sbin/hotplug-call", "tty" ],
+		[ "if",
+			[ "isdir", "/etc/hotplug.d/%SUBSYSTEM%" ],
+			[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+		]
 	],
 ]