diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-03-12 17:15:15 +0100 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-03-18 15:55:48 -0400 |
| commit | b45bb6733bd6ea9daeedf3051bc06eefd75606a1 (patch) | |
| tree | bb131be3dee1b8e88c3e0915e819c9fe82ce9f73 | |
| parent | 51ed849fb0ce93dc37776bcf7676082cc9c1d203 (diff) | |
rules: merge tty and serial rules file
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | rules/60-serial.rules (renamed from rules/60-persistent-serial.rules) | 18 | ||||
| -rw-r--r-- | rules/75-tty-description.rules | 12 | ||||
| -rw-r--r-- | rules/Makefile.am | 5 |
3 files changed, 14 insertions, 21 deletions
diff --git a/rules/60-persistent-serial.rules b/rules/60-serial.rules index 2948200c53..f303e27fd5 100644 --- a/rules/60-persistent-serial.rules +++ b/rules/60-serial.rules @@ -1,8 +1,14 @@ # do not edit this file, it will be overwritten on update -ACTION=="remove", GOTO="persistent_serial_end" -SUBSYSTEM!="tty", GOTO="persistent_serial_end" -KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="persistent_serial_end" +ACTION=="remove", GOTO="serial_end" +SUBSYSTEM!="tty", GOTO="serial_end" + +SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" +SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci" +SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" + +# /dev/serial/by-path/, /dev/serial/by-id/ for USB devices +KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="serial_end" SUBSYSTEMS=="usb-serial", ENV{.ID_PORT}="$attr{port_number}" @@ -11,10 +17,10 @@ ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="", SYMLINK+="serial/by-path/$env{ID_PATH}" ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-path/$env{ID_PATH}-port$env{.ID_PORT}" IMPORT{builtin}="usb_id" -ENV{ID_SERIAL}=="", GOTO="persistent_serial_end" +ENV{ID_SERIAL}=="", GOTO="serial_end" SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACE_NUM}="$attr{bInterfaceNumber}" -ENV{ID_USB_INTERFACE_NUM}=="", GOTO="persistent_serial_end" +ENV{ID_USB_INTERFACE_NUM}=="", GOTO="serial_end" ENV{.ID_PORT}=="", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}" ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}-port$env{.ID_PORT}" -LABEL="persistent_serial_end" +LABEL="serial_end" diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules deleted file mode 100644 index 11277b7d6f..0000000000 --- a/rules/75-tty-description.rules +++ /dev/null @@ -1,12 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="tty_end" -SUBSYSTEM!="tty", GOTO="tty_end" - -SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" -SUBSYSTEMS=="usb", GOTO="tty_end" - -SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" -SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci" - -LABEL="tty_end" diff --git a/rules/Makefile.am b/rules/Makefile.am index 54fff4969d..7471a6c3d7 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -3,22 +3,21 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} dist_udevrules_DATA = \ 42-usb-hid-pm.rules \ 50-udev-default.rules \ - 60-cdrom_id.rules \ 60-block.rules \ + 60-cdrom_id.rules \ 60-drm.rules \ 60-keyboard.rules \ 60-persistent-alsa.rules \ 60-persistent-input.rules \ - 60-persistent-serial.rules \ 60-persistent-storage-tape.rules \ 60-persistent-v4l.rules \ + 60-serial.rules \ 61-accelerometer.rules \ 64-btrfs.rules \ 70-mouse.rules \ 70-touchpad.rules \ 75-net-description.rules \ 75-probe_mtd.rules \ - 75-tty-description.rules \ 78-sound-card.rules \ 80-net-name-slot.rules |