From df6b7cd94981d718b97ac90d8c9290fafce784e6 Mon Sep 17 00:00:00 2001 From: blogic Date: Fri, 26 Feb 2016 08:35:43 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48799 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/system/procd/files/hotplug.json | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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 @@ -58,10 +58,6 @@ ] } ], [ "if", - [ "eq", "SUBSYSTEM", "platform" ], - [ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ] - ], - [ "if", [ "and", [ "has", "BUTTON" ], [ "eq", "SUBSYSTEM", "button" ], @@ -69,18 +65,16 @@ [ "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%" ] + ] ], ] -- 2.11.0