aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Heimpold <mhei@heimpold.de>2019-04-02 21:48:11 +0200
committerHans Dedecker <dedeckeh@gmail.com>2019-04-04 17:09:40 +0200
commit6e060bd62c85a797d9390effb5dc1387faa467c2 (patch)
tree763a43543efc2db86ffabf5a027dfc375978246f
parent8dacd75ea8869b0616b6be1a2156dc5e8c9eac9e (diff)
downloadupstream-6e060bd62c85a797d9390effb5dc1387faa467c2.tar.gz
upstream-6e060bd62c85a797d9390effb5dc1387faa467c2.tar.bz2
upstream-6e060bd62c85a797d9390effb5dc1387faa467c2.zip
base-files/hotplug: fix dedicated group for tty devices
Commit 124ab1dc0a and 5523ee3459 introduced the assignment of the group "tty" to /dev/tty* devices in order to support unprivileged user access to serial devices. However, due to an improperly rebased commit this feature broke. This patch restores the lost hunk in hotplug.json file to re-introduce this feature and also renames the existing "tty" group to "dialout" as this is the more typical name for such a group on desktop systems. Fixes: 5209cfa534 ("procd: fix hotplug.json syntax") Signed-off-by: Michael Heimpold <mhei@heimpold.de> Acked-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/base-files/files/etc/group2
-rw-r--r--package/system/procd/files/hotplug.json4
2 files changed, 5 insertions, 1 deletions
diff --git a/package/base-files/files/etc/group b/package/base-files/files/etc/group
index e8e2adf4ac..5b06dc6db9 100644
--- a/package/base-files/files/etc/group
+++ b/package/base-files/files/etc/group
@@ -1,8 +1,8 @@
root:x:0:
daemon:x:1:
adm:x:4:
-tty:x:5:
mail:x:8:
+dialout:x:20:
audio:x:29:
www-data:x:33:
ftp:x:55:
diff --git a/package/system/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
index 1c949bbea3..f676bac79e 100644
--- a/package/system/procd/files/hotplug.json
+++ b/package/system/procd/files/hotplug.json
@@ -21,6 +21,10 @@
[ "makedev", "/dev/%DEVNAME%", "0660", "audio" ]
],
[ "if",
+ [ "regex", "DEVNAME", "^tty" ],
+ [ "makedev", "/dev/%DEVNAME%", "0660", "dialout" ]
+ ],
+ [ "if",
[ "has", "DEVNAME" ],
[ "makedev", "/dev/%DEVNAME%", "0600" ]
]