rules: remove DEVTYPE disk/partition

diff --git a/TODO b/TODO
index 4d6f6d4d192e4d786cc82a526995ef0f8e6ae0fd..8986d19722cb6e9928d032ca248b8561dfdb7648 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@
   o drop pnp shell script, acpi will take care of loading pnp modules
   o add DVB variables to kernel (patch merged in v4l tree), drop the
     shell script rule
-  o DEVTYPE for disks is set by the kernel, they will be removed from
-    the default rules
   o "udevadm control" commands will only accept the --<command> syntax
   o symlink names to udevadm will no longer be resolved to old command names
   o get distros to agree on a default set of rules

diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index dec83cfe7ea33c8167a513918c307d1db3d6b820..4f8de28a7fbb525e0e53f27e8b84830d78bf3b70 100644 (file)
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -19,10 +19,6 @@ KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
 # ignore partitions that span the entire disk
 TEST=="whole_disk", GOTO="persistent_storage_end"
 
-# /sys/class/block will export this
-ENV{DEVTYPE}!="?*", ATTR{range}=="?*", ENV{DEVTYPE}="disk"
-ENV{DEVTYPE}!="?*", ATTR{start}=="?*", ENV{DEVTYPE}="partition"
-
 # for partitions import parent information
 ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*"