aboutsummaryrefslogtreecommitdiffstats
path: root/udev-config
diff options
context:
space:
mode:
authorBryan Kadzban <bryan@linuxfromscratch.org>2008-12-07 17:29:25 +0000
committerBryan Kadzban <bryan@linuxfromscratch.org>2008-12-07 17:29:25 +0000
commitcd358b80691a40bc08d535402045d6f50d6c8eaf (patch)
treeb289d74587de753c0c732101c5ca27c2718a2e3e /udev-config
parentb278b82456dc953e7fde79126b152f92ce2a1990 (diff)
Remove several rules that are duplicates from upstream. Remove two rules (/dev/js and /dev/tjs) that will never match any device, according to devices.txt.
Fixes the first part of #2297. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8770 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'udev-config')
-rw-r--r--udev-config/55-lfs.rules18
-rw-r--r--udev-config/ChangeLog5
2 files changed, 5 insertions, 18 deletions
diff --git a/udev-config/55-lfs.rules b/udev-config/55-lfs.rules
index e4ef214a7..d26d0d315 100644
--- a/udev-config/55-lfs.rules
+++ b/udev-config/55-lfs.rules
@@ -54,15 +54,6 @@ KERNEL=="event*", MODE="0644"
KERNEL=="ts*", MODE="0644"
KERNEL=="psaux", MODE="0644"
-KERNEL=="js", MODE="0644"
-KERNEL=="djs", MODE="0644"
-
-# USB devices go in their own subdirectory
-
-KERNEL=="hiddev*", NAME="usb/%k"
-KERNEL=="legousbtower*", NAME="usb/%k"
-KERNEL=="dabusb*", NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
# DRI devices are managed by the X server, so prevent udev from creating them
@@ -71,14 +62,6 @@ KERNEL=="card*", OPTIONS+="ignore_device"
# Video devices
KERNEL=="fb[0-9]*", GROUP="video"
-KERNEL=="video[0-9]*", GROUP="video"
-KERNEL=="radio[0-9]*", GROUP="video"
-KERNEL=="vbi[0-9]*", GROUP="video"
-KERNEL=="vtx[0-9]*", GROUP="video"
-
-# DVB devices
-
-SUBSYSTEM=="dvb", GROUP="video"
# Storage/memory devices
@@ -101,5 +84,4 @@ KERNEL=="st[0-9]*", GROUP="tape"
KERNEL=="nst[0-9]*", GROUP="tape"
# Override floppy devices
-KERNEL=="fd[0-9]", GROUP="floppy"
KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
diff --git a/udev-config/ChangeLog b/udev-config/ChangeLog
index ca31b8c41..e4fcd122e 100644
--- a/udev-config/ChangeLog
+++ b/udev-config/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-07 Bryan Kadzban <bryan@linuxfromscratch.org>
+ * 55-lfs.rules: Remove several rules that are either provided by upstream,
+ or that don't have any effect (there is no /dev/js or /dev/djs according
+ to devices.txt).
+
2008-11-11 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules, 61-cdrom.rules: Fix comments to use the right rule
numbers. Thanks to Trent Shea for the fix. Closes #2278.