Update udev rules.

diff --git a/config/udev/55-ipfire.rules b/config/udev/55-ipfire.rules
index d920008fc676371d7ebc7983f616d7d18a3e25c4..890311cc1e57f5bddea8904e781db187d47bea9e 100644 (file)
--- a/config/udev/55-ipfire.rules
+++ b/config/udev/55-ipfire.rules
@@ -1,4 +1,4 @@
-# /etc/udev/rules.d/25-lfs.rules: Rule definitions for LFS.
+# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS.
 
 # Core kernel devices
 
@@ -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
 
@@ -99,3 +82,8 @@ KERNEL=="pt[0-9]*",     GROUP="tape"
 KERNEL=="npt[0-9]*",    GROUP="tape"
 KERNEL=="st[0-9]*",     GROUP="tape"
 KERNEL=="nst[0-9]*",    GROUP="tape"
+
+# Override floppy devices
+KERNEL=="fd[0-9]", ACTION=="add|change", ATTRS{cmos}=="?*", \
+  RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
+

diff --git a/config/udev/61-cdrom.rules b/config/udev/61-cdrom.rules
index 5a38a721010d323ca08f238f2e27f65dfea3c981..4db9efeb60f8b4fd69ec8cec8a64c7312fa5b0d8 100644 (file)
--- a/config/udev/61-cdrom.rules
+++ b/config/udev/61-cdrom.rules
@@ -1,3 +1,3 @@
-# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions.
+# /etc/udev/rules.d/61-cdrom.rules: Set CD-ROM permissions.
 
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", GROUP="cdrom"
+ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", GROUP="cdrom"