chiark / gitweb /
persistent device naming: cleanup storage rules
authorKay Sievers <kay.sievers@vrfy.org>
Thu, 3 Apr 2008 19:05:19 +0000 (21:05 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Thu, 3 Apr 2008 19:05:19 +0000 (21:05 +0200)
etc/udev/rules.d/60-persistent-storage.rules

index 990703c..a1e0917 100644 (file)
@@ -14,7 +14,7 @@ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="p
 KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
 
 # ignore partitions that span the entire disk
-ATTR{whole_disk}=="*", GOTO="persistent_storage_end"
+TEST=="whole_disk", GOTO="persistent_storage_end"
 
 # /sys/class/block will export this
 ENV{DEVTYPE}!="?*", ATTR{range}=="?*", ENV{DEVTYPE}="disk"
@@ -47,9 +47,6 @@ ENV{DEVTYPE}=="disk", IMPORT{program}="path_id %p"
 ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
 ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
 
-KERNEL=="sr*", GOTO="persistent_storage_end"
-KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
-
 # by-label/by-uuid (filesystem properties)
 ENV{DEVTYPE}=="partition", IMPORT{program}="vol_id --export $tempnode"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"