summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-08-11 15:08:08 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-08-11 15:08:08 -0700
commit55ac5dad09ce1b7663e17c6f166e6ef74153f93d (patch)
tree061a847cdc3e078394778aea2ea26f884e503fa1 /etc
parent5a64cea1e18dd4e62b6388c8bed86192a1e0c731 (diff)
Change the gentoo rules to use cdrom_id instead of cdsymlink.sh
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'etc')
-rw-r--r--etc/udev/gentoo/udev.rules15
1 files changed, 7 insertions, 8 deletions
diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index 1c1bfed81d..f8f7b45bb0 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -33,14 +33,13 @@ KERNEL=="ircomm*", NAME="%k", GROUP="tty"
SUBSYSTEM=="block", GROUP="disk"
# cdrom symlinks and other good cdrom naming
-BUS=="ide", KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS=="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK+="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-
-# devfs-names for ide-devices
-# Note, this is going away soon...
-# /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS=="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK+="%c{1} %c{2}", GROUP="%c{3}"
+BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/etc/udev/scripts/cdrom_id --export $tempnode"
+BUS=="scsi", KERNEL="sr[0-9]*", ACTION=="add", IMPORT="/etc/udev/scripts/cdrom_id --export $tempnode"
+BUS=="scsi", KERNEL="scd[a-z]", ACTION=="add", IMPORT="/etc/udev/scripts/cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="cdrom"
+ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e"
+ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"
+ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%e"
# disk devices
KERNEL=="sd*", NAME="%k", GROUP="disk"