diff options
| author | Kay Sievers <kay.sievers@suse.de> | 2005-08-12 00:50:48 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@suse.de> | 2005-08-12 00:50:48 +0200 |
| commit | 5590ace308dc57821a5704bdf4a6f586ae2fd698 (patch) | |
| tree | 6ce2d47b9b1964a7d4906d8623466b2e40f534ea /etc/udev | |
| parent | f5bed72a53c16e203d5f822167778355530c362a (diff) | |
update SUSE rules
don't use ID_TYPE, so cdroms will be in /dev/disk/
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'etc/udev')
| -rw-r--r-- | etc/udev/suse/udev.rules | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/etc/udev/suse/udev.rules b/etc/udev/suse/udev.rules index 0e3d06817a..683a22a2bb 100644 --- a/etc/udev/suse/udev.rules +++ b/etc/udev/suse/udev.rules @@ -195,34 +195,33 @@ SUBSYSTEM!="block", GOTO="persistent_end" KERNEL=="ram*|loop*|fd*", GOTO="persistent_end" # never access removable ide devices, the drivers are causing event loops on open() -SUBSYSTEM=="block", BUS=="ide", SYSFS{removable}="1", GOTO="persistent_end" +SUBSYSTEM=="block", BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end" # by-id (hardware serial number) KERNEL=="hd*[!0-9]", IMPORT="/sbin/ata_id --export $tempnode" -KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" -KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="$env{ID_TYPE}/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" +KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" +KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" -KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394\nID_TYPE=disk'" +KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394\n'" KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x" KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -s %p" KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -a -s %p" KERNEL=="dasd*[!0-9]", IMPORT="/sbin/dasd_id --export $tempnode" -KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}" +KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" # for partitions import parent information KERNEL=="sd*[0-9]|dasd*[0-9]", IMPORT{parent}=="ID_*" -KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" +KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" # by-path (shortest physical path) -KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PATH}" +KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}" KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" -KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PATH}-part%n" +KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" # by-label/by-uuid (filesystem properties) KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end" KERNEL=="sr*", GOTO="persistent_end" -KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode" -KERNEL=="*[!0-9]", SYSFS{range}=="[1-9]*", IMPORT="/sbin/vol_id --export $tempnode" +IMPORT="/sbin/vol_id --export $tempnode" ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" LABEL="persistent_end" |