From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 13 Nov 2008 06:45:58 +0000 (+0100)
Subject: rules: remove DEVTYPE disk/partition
X-Git-Tag: 174~1325
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8e9c06be26a5c40454bb3925a10d9ccdaab37b2d;ds=sidebyside

rules: remove DEVTYPE disk/partition
---

diff --git a/TODO b/TODO
index 4d6f6d4d1..8986d1972 100644
--- 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 dec83cfe7..4f8de28a7 100644
--- 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_*"