base-files: cleanup permissions of device files in common hotplug rules (#9211)

SVN-Revision: 26808

1 files changed, 15 insertions, 6 deletions

diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
index a96a8fa761..101d4512fb 100644
--- a/package/base-files/files/etc/hotplug2-common.rules
+++ b/package/base-files/files/etc/hotplug2-common.rules
@@ -6,7 +6,7 @@
 
 $include /etc/hotplug2-platform.rules
 
-DEVICENAME ~~ (^null$|^full$|^ptmx$|^tty|^zero$|^gpio|^hvc) {
+DEVICENAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
 	makedev /dev/%DEVICENAME% 0666
 	next-event
 }
@@ -15,10 +15,6 @@ DEVICENAME ~~ (^tun|^tap[0-9]$) {
 	makedev /dev/net/%DEVICENAME% 0644
 }
 
-DEVICENAME ~~ ^ppp {
-	makedev /dev/%DEVICENAME% 0600
-}
-
 DEVICENAME ~~ (^controlC[0-9]$|^pcmC[0-9]D[0-9]|^timer$) {
 	makedev /dev/snd/%DEVICENAME% 0644
 	next-event
@@ -35,12 +31,25 @@ DEVPATH is set, SUBSYSTEM == input {
 
 DEVICENAME == device-mapper {
 	makedev /dev/mapper/control 0600
+	next-event
 }
 
-DEVPATH is set {
+ACTION == add, DEVPATH is set {
 	makedev /dev/%DEVICENAME% 0644
 }
 
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^tty {
+	chmod 0666 /dev/%DEVICENAME%
+}
+
+ACTION == add, DEVPATH is set, DEVICENAME ~~ ^ppp {
+	chmod 0600 /dev/%DEVICENAME%
+}
+
+ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
+	remove /dev/%DEVICENAME%
+}
+
 FIRMWARE is set, ACTION == add {
 	exec /sbin/hotplug-call firmware
 	load-firmware /lib/firmware