procd: Set /dev/kmsg to 600

[openwrt/openwrt.git] / package / system / procd / files / hotplug.json

diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index b3121789e0ace21917ba3989ad7f34c59fac8f1e..e5f8d967e8c16c8dc85a437a5259c0ba840d766c 100644 (file)
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -8,13 +8,8 @@
                                ],
                                [
                                        [ "if",
-                                               [ "or",
-                                                       [ "eq", "DEVNAME",
-                                                               [ "null", "full", "ptmx", "zero" ],
-                                                       ],
-                                                       [ "regex", "DEVNAME",
-                                                               [ "^gpio", "^hvc", "^tty" ],
-                                                       ],
+                                               [ "eq", "DEVNAME",
+                                                       [ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ],
                                                ],
                                                [
                                                        [ "makedev", "/dev/%DEVNAME%", "0666" ],
@@ -22,18 +17,12 @@
                                                ]
                                        ],
                                        [ "if",
-                                               [ "or",
-                                                       [ "eq", "DEVNAME", "mapper/control" ],
-                                                       [ "regex", "DEVPATH", "^ppp" ],
-                                               ],
-                                               [
-                                                       [ "makedev", "/dev/%DEVNAME%", "0600" ],
-                                                       [ "return" ],
-                                               ],
+                                               [ "regex", "DEVNAME", "^snd" ],
+                                               [ "makedev", "/dev/%DEVNAME%", "0660", "audio" ],
                                        ],
                                        [ "if",
                                                [ "has", "DEVNAME" ],
-                                               [ "makedev", "/dev/%DEVNAME%", "0644" ],
+                                               [ "makedev", "/dev/%DEVNAME%", "0600" ],
                                        ],
                                ],
                        ],
@@ -57,30 +46,24 @@
                        ]
                ]
        } ],
-       [ "if",
-               [ "eq", "SUBSYSTEM", "platform" ],
-               [ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
-       ],
        [ "if",
                [ "and",
                        [ "has", "BUTTON" ],
                        [ "eq", "SUBSYSTEM", "button" ],
                ],
-               [ "exec", "/etc/rc.button/%BUTTON%" ]
-       ],
-       [ "if",
-               [ "eq", "SUBSYSTEM",
-                       [ "net", "input", "usb", "ieee1394", "block", "atm", "zaptel", "tty", "button" ]
-               ],
-               [ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
+               [ "button", "/etc/rc.button/%BUTTON%" ]
        ],
        [ "if",
                [ "and",
-                       [ "eq", "SUBSYSTEM",
-                               [ "tty", "usb-serial" ]
-                       ],
-                       [ "regex", "DEVNAME", "^ttyUSB" ],
+                       [ "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%" ]
+               ]
        ],
 ]