diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-03-12 17:15:15 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-03-12 17:22:19 +0100 |
| commit | 1c5f4cb190e80b1b121b3c0af5b72d2a2b8267c1 (patch) | |
| tree | 955616c8f059b62214a6c55b1a0c4ae1442ba075 | |
| parent | 654b036ba7368d2f9f2577e2d64d45d52fa8262a (diff) | |
| download | systemd-1c5f4cb190e80b1b121b3c0af5b72d2a2b8267c1.tar.gz | |
rules: merge tty and serial rules file
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | rules/60-serial.rules (renamed from rules/60-persistent-serial.rules) | 18 | ||||
| -rw-r--r-- | rules/75-tty-description.rules | 12 |
3 files changed, 13 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index e36e9db480..481d4782a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3691,15 +3691,14 @@ dist_udevrules_DATA += \ rules/60-drm.rules \ rules/60-keyboard.rules \ rules/60-persistent-storage-tape.rules \ - rules/60-persistent-serial.rules \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ + rules/60-tty.rules \ rules/64-btrfs.rules \ rules/70-mouse.rules \ rules/70-touchpad.rules \ rules/75-net-description.rules \ - rules/75-tty-description.rules \ rules/78-sound-card.rules \ rules/80-net-setup-link.rules 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" |