Ticket #1804: udev-config.diff

25-lfs.rules

@@ -121 +121 @@
 # dmsetup and lvm2 related programs create devicemapper devices so we prevent
 # udev from creating them
 
-KERNEL=="dm-*",                                         NAME=""
+KERNEL=="dm-*",                                         OPTIONS+="ignore_device"
+KERNEL=="device-mapper",                                OPTIONS+="ignore_device"
 
 KERNEL=="ht[0-9]*",                     GROUP="tape"
 KERNEL=="nht[0-9]*",                    GROUP="tape"

81-cdrom.rules

@@ +1 @@
+# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions.
+
+ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", GROUP="cdrom"

contrib/debian/81-cdrom.rules

@@ -1 @@
-# /etc/udev/rules.d/81-cdrom.rules: Generate rules for newly-added CD drives.
+# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions and get device capabilities
 
-ACTION=="add", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"
+ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"

contrib/debian/write_cd_aliases

@@ -68 +68 @@
   fi
 
   [ "$comment" ] && echo "# $comment"
-  echo "ACTION==\"add\", $match, ENV{ID_CDROM}==\"1\", SYMLINK+=\"$link\", ENV{GENERATED}=\"1\""
+  echo "ACTION==\"add\", SUBSYSTEM==\"block\", $match, ENV{ID_CDROM}==\"1\", SYMLINK+=\"$link\", ENV{GENERATED}=\"1\""
   } >> $RULES_FILE
   SYMLINKS="$SYMLINKS $link"
 }