udev: update some rules

2 files changed, 12 insertions, 31 deletions

diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 5ad787fc76..6e3ab94d54 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -1,40 +1,30 @@
 # do not edit this file, it will be overwritten on update
 
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
-KERNEL=="ptmx", GROUP="tty", MODE="0666"
-KERNEL=="tty", GROUP="tty", MODE="0666"
-KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
-KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
+SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
+SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666"
+SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
+SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
 
 # serial
 KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-KERNEL=="mwave", GROUP="dialout"
-KERNEL=="hvc*|hvsi*", GROUP="dialout"
 
 # virtio serial / console ports
-KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
+SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
 
 # mem
-KERNEL=="null|zero|full|random|urandom", MODE="0666"
-KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
+SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
 
 # input
 SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
-KERNEL=="mouse*|mice|event*", MODE="0640"
-KERNEL=="ts[0-9]*|uinput", MODE="0640"
-KERNEL=="js[0-9]*", MODE="0644"
+SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640"
+SUBSYSTEM=="input", KERNEL=="ts[0-9]*|uinput", MODE="0640"
+SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0644"
 
 # video4linux
 SUBSYSTEM=="video4linux", GROUP="video"
-KERNEL=="vttuner*", GROUP="video"
-KERNEL=="vtx*|vbi*", GROUP="video"
-KERNEL=="winradio*", GROUP="video"
 
 # graphics
-KERNEL=="agpgart", GROUP="video"
-KERNEL=="pmu", GROUP="video"
-KERNEL=="nvidia*|nvidiactl*", GROUP="video"
+SUBSYSTEM=="misc", KERNEL=="agpgart", GROUP="video"
 SUBSYSTEM=="graphics", GROUP="video"
 SUBSYSTEM=="drm", GROUP="video"
 
@@ -72,18 +62,15 @@ SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
 # cdrom
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
 SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+KERNEL=="sch[0-9]*", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
 KERNEL=="pktcdvd", GROUP="cdrom"
 
 # tape
-KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
-KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
 SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
 
 # block-related
-KERNEL=="sch[0-9]*", GROUP="disk"
 SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
-KERNEL=="pg[0-9]*", GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
 KERNEL=="rawctl", GROUP="disk"
 SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk"
@@ -94,14 +81,8 @@ SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
 KERNEL=="rfkill", MODE="0644"
 
-# CPU
-KERNEL=="cpu[0-9]*", MODE="0444"
-
 KERNEL=="fuse", ACTION=="add", MODE="0666", OPTIONS+="static_node=fuse"
 
 SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
-KERNEL=="mmtimer", MODE="0644"
-KERNEL=="rflash[0-9]*", MODE="0400"
-KERNEL=="rrom[0-9]*", MODE="0400"
 
 SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
diff --git a/src/login/71-seat.rules b/src/login/71-seat.rules
index 52750f7885..3f07ca1695 100644
--- a/src/login/71-seat.rules
+++ b/src/login/71-seat.rules
@@ -19,7 +19,7 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="000[13]", ENV{ID_AUT
 # Mimo 720, with integrated USB hub, displaylink graphics, and e2i touchscreen
 SUBSYSTEM=="usb", ATTR{idVendor}=="058f", ATTR{idProduct}=="6254", ENV{ID_AUTOSEAT}="1"
 
-TAG=="seat", ENV{ID_PATH}=="", IMPORT{program}="path_id %p"
+TAG=="seat", ENV{ID_PATH}=="", IMPORT{builtin}="path_id"
 TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}"
 
 LABEL="seat_end"