From 55ac5dad09ce1b7663e17c6f166e6ef74153f93d Mon Sep 17 00:00:00 2001 From: Greg KH Date: Thu, 11 Aug 2005 15:08:08 -0700 Subject: Change the gentoo rules to use cdrom_id instead of cdsymlink.sh Signed-off-by: Greg Kroah-Hartman --- etc/udev/gentoo/udev.rules | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'etc/udev') 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" -- cgit v1.2.3-54-g00ecf