projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
procd: fix hotplug.json syntax
[openwrt/staging/dedeckeh.git]
/
package
/
system
/
procd
/
files
/
hotplug.json
diff --git
a/package/system/procd/files/hotplug.json
b/package/system/procd/files/hotplug.json
index 168f9b83a80e886563a8e3c6b7889e817ce5bf65..1c949bbea33a0c066934aef92d53d6a096192013 100644
(file)
--- a/
package/system/procd/files/hotplug.json
+++ b/
package/system/procd/files/hotplug.json
@@
-4,31
+4,27
@@
[ "if",
[ "and",
[ "has", "MAJOR" ],
[ "if",
[ "and",
[ "has", "MAJOR" ],
- [ "has", "MINOR" ]
,
+ [ "has", "MINOR" ]
],
[
[ "if",
[ "eq", "DEVNAME",
],
[
[ "if",
[ "eq", "DEVNAME",
- [ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ]
,
+ [ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ]
],
[
[ "makedev", "/dev/%DEVNAME%", "0666" ],
],
[
[ "makedev", "/dev/%DEVNAME%", "0666" ],
- [ "return" ]
,
+ [ "return" ]
]
],
[ "if",
[ "regex", "DEVNAME", "^snd" ],
]
],
[ "if",
[ "regex", "DEVNAME", "^snd" ],
- [ "makedev", "/dev/%DEVNAME%", "0660", "audio" ],
- ],
- [ "if",
- [ "regex", "DEVNAME", "^tty" ],
- [ "makedev", "/dev/%DEVNAME%", "0660", "tty" ],
+ [ "makedev", "/dev/%DEVNAME%", "0660", "audio" ]
],
[ "if",
[ "has", "DEVNAME" ],
],
[ "if",
[ "has", "DEVNAME" ],
- [ "makedev", "/dev/%DEVNAME%", "0600" ]
,
- ]
,
- ]
,
+ [ "makedev", "/dev/%DEVNAME%", "0600" ]
+ ]
+ ]
],
[ "if",
[ "has", "FIRMWARE" ],
],
[ "if",
[ "has", "FIRMWARE" ],
@@
-37,14
+33,14
@@
[ "load-firmware", "/lib/firmware" ],
[ "return" ]
]
[ "load-firmware", "/lib/firmware" ],
[ "return" ]
]
- ]
,
+ ]
],
"remove" : [
[ "if",
[ "and",
[ "has", "DEVNAME" ],
[ "has", "MAJOR" ],
],
"remove" : [
[ "if",
[ "and",
[ "has", "DEVNAME" ],
[ "has", "MAJOR" ],
- [ "has", "MINOR" ]
,
+ [ "has", "MINOR" ]
],
[ "rm", "/dev/%DEVNAME%" ]
]
],
[ "rm", "/dev/%DEVNAME%" ]
]
@@
-53,7
+49,7
@@
[ "if",
[ "and",
[ "has", "BUTTON" ],
[ "if",
[ "and",
[ "has", "BUTTON" ],
- [ "eq", "SUBSYSTEM", "button" ]
,
+ [ "eq", "SUBSYSTEM", "button" ]
],
[ "button", "/etc/rc.button/%BUTTON%" ]
],
],
[ "button", "/etc/rc.button/%BUTTON%" ]
],
@@
-69,5
+65,5
@@
[ "isdir", "/etc/hotplug.d/%SUBSYSTEM%" ],
[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
]
[ "isdir", "/etc/hotplug.d/%SUBSYSTEM%" ],
[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
]
- ]
,
+ ]
]
]