procd: fix hotplug.json syntax

[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 de8ba105c539e992c92664e421f07f3978659ff5..1c949bbea33a0c066934aef92d53d6a096192013 100644 (file)
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -4,46 +4,27 @@
                        [ "if",
                                [ "and",
                                        [ "has", "MAJOR" ],
-                                       [ "has", "MINOR" ],
+                                       [ "has", "MINOR" ]
                                ],
                                [
                                        [ "if",
-                                               [ "or",
-                                                       [ "eq", "DEVNAME",
-                                                               [ "null", "full", "ptmx", "zero", "tty" ],
-                                                       ],
-                                                       [ "regex", "DEVNAME",
-                                                               [ "^gpio", "^hvc" ],
-                                                       ],
+                                               [ "eq", "DEVNAME",
+                                                       [ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ]
                                                ],
                                                [
                                                        [ "makedev", "/dev/%DEVNAME%", "0666" ],
-                                                       [ "return" ],
+                                                       [ "return" ]
                                                ]
                                        ],
-                                       [ "if",
-                                               [ "or",
-                                                       [ "eq", "DEVNAME", "mapper/control" ],
-                                                       [ "regex", "DEVPATH", "^ppp" ],
-                                               ],
-                                               [
-                                                       [ "makedev", "/dev/%DEVNAME%", "0600" ],
-                                                       [ "return" ],
-                                               ],
-                                       ],
                                        [ "if",
                                                [ "regex", "DEVNAME", "^snd" ],
-                                               [ "makedev", "/dev/%DEVNAME%", "0660", "audio" ],
-                                       ],
-                                       [ "if",
-                                               [ "regex", "DEVNAME", "^ttyS" ],
-                                               [ "makedev", "/dev/%DEVNAME%", "0664" ],
+                                               [ "makedev", "/dev/%DEVNAME%", "0660", "audio" ]
                                        ],
                                        [ "if",
                                                [ "has", "DEVNAME" ],
-                                               [ "makedev", "/dev/%DEVNAME%", "0644" ],
-                                       ],
-                               ],
+                                               [ "makedev", "/dev/%DEVNAME%", "0600" ]
+                                       ]
+                               ]
                        ],
                        [ "if",
                                [ "has", "FIRMWARE" ],
@@ -52,14 +33,14 @@
                                        [ "load-firmware", "/lib/firmware" ],
                                        [ "return" ]
                                ]
-                       ],
+                       ]
                ],
                "remove" : [
                        [ "if",
                                [ "and",
                                        [ "has", "DEVNAME" ],
                                        [ "has", "MAJOR" ],
-                                       [ "has", "MINOR" ],
+                                       [ "has", "MINOR" ]
                                ],
                                [ "rm", "/dev/%DEVNAME%" ]
                        ]
@@ -68,7 +49,7 @@
        [ "if",
                [ "and",
                        [ "has", "BUTTON" ],
-                       [ "eq", "SUBSYSTEM", "button" ],
+                       [ "eq", "SUBSYSTEM", "button" ]
                ],
                [ "button", "/etc/rc.button/%BUTTON%" ]
        ],
@@ -84,5 +65,5 @@
                        [ "isdir", "/etc/hotplug.d/%SUBSYSTEM%" ],
                        [ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
                ]
-       ],
+       ]
 ]