[source] procd: fix hotplug.json syntax

LEDE Commits lede-commits at lists.infradead.org
Fri Aug 18 09:54:03 PDT 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/5209cfa534293cb6d27574b51d03bd69a5defb0c

commit 5209cfa534293cb6d27574b51d03bd69a5defb0c
Author: Florian Eckert <fe at dev.tdt.de>
AuthorDate: Fri Aug 18 15:06:25 2017 +0200

    procd: fix hotplug.json syntax
    
    Signed-off-by: Florian Eckert <fe at dev.tdt.de>
---
 package/system/procd/files/hotplug.json | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index 168f9b8..1c949bb 100644
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -4,31 +4,27 @@
 			[ "if",
 				[ "and",
 					[ "has", "MAJOR" ],
-					[ "has", "MINOR" ],
+					[ "has", "MINOR" ]
 				],
 				[
 					[ "if",
 						[ "eq", "DEVNAME",
-							[ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ],
+							[ "null", "full", "ptmx", "zero", "tty", "net", "random", "urandom" ]
 						],
 						[
 							[ "makedev", "/dev/%DEVNAME%", "0666" ],
-							[ "return" ],
+							[ "return" ]
 						]
 					],
 					[ "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" ],
-						[ "makedev", "/dev/%DEVNAME%", "0600" ],
-					],
-				],
+						[ "makedev", "/dev/%DEVNAME%", "0600" ]
+					]
+				]
 			],
 			[ "if",
 				[ "has", "FIRMWARE" ],
@@ -37,14 +33,14 @@
 					[ "load-firmware", "/lib/firmware" ],
 					[ "return" ]
 				]
-			],
+			]
 		],
 		"remove" : [
 			[ "if",
 				[ "and",
 					[ "has", "DEVNAME" ],
 					[ "has", "MAJOR" ],
-					[ "has", "MINOR" ],
+					[ "has", "MINOR" ]
 				],
 				[ "rm", "/dev/%DEVNAME%" ]
 			]
@@ -53,7 +49,7 @@
 	[ "if",
 		[ "and",
 			[ "has", "BUTTON" ],
-			[ "eq", "SUBSYSTEM", "button" ],
+			[ "eq", "SUBSYSTEM", "button" ]
 		],
 		[ "button", "/etc/rc.button/%BUTTON%" ]
 	],
@@ -69,5 +65,5 @@
 			[ "isdir", "/etc/hotplug.d/%SUBSYSTEM%" ],
 			[ "exec", "/sbin/hotplug-call", "%SUBSYSTEM%" ]
 		]
-	],
+	]
 ]



More information about the lede-commits mailing list