summaryrefslogtreecommitdiff
path: root/etc/udev/persistent.rules
diff options
context:
space:
mode:
author <gregkh@suse.de>2005-09-27 08:12:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-27 08:12:09 -0700
commit9bd72b9b6b2645ea3c36ef0be9a070e8ff67904f (patch)
tree37d337daf2154c0ca86ffa0189bb5cd552415fc4 /etc/udev/persistent.rules
parent3162a25fd3d6fe95026dc754ef5d5859b62a6b7c (diff)
parentaf2703d39aaf924cbfdce5a41b498a0a025c34d1 (diff)
Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev
Diffstat (limited to 'etc/udev/persistent.rules')
-rw-r--r--etc/udev/persistent.rules5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/udev/persistent.rules b/etc/udev/persistent.rules
index 0ca0c56545..0b231aacd5 100644
--- a/etc/udev/persistent.rules
+++ b/etc/udev/persistent.rules
@@ -8,7 +8,7 @@ SUBSYSTEM!="block", GOTO="persistent_end"
KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
# never access removable ide devices, the drivers are causing event loops on open()
-SUBSYSTEM=="block", BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
+BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
# by-id (hardware serial number)
KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
@@ -40,7 +40,8 @@ ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
# BIOS Enhanced Disk Device
KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
-ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
+KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
+KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
LABEL="persistent_end"