From: Dan Williams <dcbw@redhat.com>
Date: Tue, 16 Jun 2009 18:27:22 +0000 (+0200)
Subject: rules: tty/net - move from udev-extras
X-Git-Tag: 174~958
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5a92fd9c9b89d8c880e0a93f32555d4aa7bbc6e6

rules: tty/net - move from udev-extras
---

diff --git a/rules/Makefile.am b/rules/Makefile.am
index b1dc088e2..694c54be0 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -8,6 +8,8 @@ dist_udevrules_DATA = \
 	rules.d/60-persistent-serial.rules \
 	rules.d/60-persistent-input.rules \
 	rules.d/60-persistent-alsa.rules \
+	rules.d/75-net-description.rules \
+	rules.d/75-tty-description.rules \
 	rules.d/78-sound-card.rules \
 	rules.d/80-drivers.rules \
 	rules.d/95-udev-late.rules
diff --git a/rules/rules.d/75-net-description.rules b/rules/rules.d/75-net-description.rules
new file mode 100644
index 000000000..1c4c401d3
--- /dev/null
+++ b/rules/rules.d/75-net-description.rules
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add|change", GOTO="net_end"
+SUBSYSTEM!="net", GOTO="net_end"
+
+SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
+SUBSYSTEMS=="usb", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
+SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
+SUBSYSTEMS=="usb", GOTO="net_end"
+
+SUBSYSTEMS=="pci", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="pci-db %p"
+SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
+
+LABEL="net_end"
diff --git a/rules/rules.d/75-tty-description.rules b/rules/rules.d/75-tty-description.rules
new file mode 100644
index 000000000..ac868adc0
--- /dev/null
+++ b/rules/rules.d/75-tty-description.rules
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add|change", GOTO="tty_end"
+SUBSYSTEM!="tty", GOTO="tty_end"
+
+SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
+SUBSYSTEMS=="usb", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
+SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
+SUBSYSTEMS=="usb", GOTO="tty_end"
+
+SUBSYSTEMS=="pci", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="pci-db %p"
+SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
+
+LABEL="tty_end"