udev: revert workarounds for issues caused by the devlink creation optimization

This reverts the following two commits:
- "udev: decrease devlink priority for encrypted partitions"
  c4521fc17bb33d10bf5aca3f87f6a394dfecf423.
- "udev: decrease devlink priority for iso disks"
  df1dccd25547b430258bd42ec60428fc9aff1370.

These commits are workarounds for issues caused by
331aa7aa15ee5dd12b369b276f575d521435eb52.
With the previous commit, these workarounds are not necessary anymore,
as partitions are always processed later than their whole disk, and
a decrypted volume is also processed later than its backing volume.

diff --git a/rules.d/60-persistent-storage.rules.in b/rules.d/60-persistent-storage.rules.in
index 39a65550457bc1f654ce188e73988ae97c877757..67874302084d56bca7dccd2b3e013c69829a930e 100644 (file)
--- a/rules.d/60-persistent-storage.rules.in
+++ b/rules.d/60-persistent-storage.rules.in
@@ -134,17 +134,6 @@ KERNEL!="sr*|mmcblk[0-9]boot[0-9]", IMPORT{builtin}="blkid"
 LABEL="persistent_storage_blkid_probe_end"
 {% endif %}
 
-# Decrease devlink priority for whole disk of ISO hybrid images, and make the
-# priority for partitions in the image relatively higher. This is for the case
-# that a disk and one of its partition have the same label or so.
-# See issue #28468.
-ENV{ID_FS_TYPE}=="iso9660", ENV{DEVTYPE}=="disk", OPTIONS+="link_priority=-10"
-
-# Decrease devlink priority for encrypted partitions, and make the priority for
-# decrypted DM devices relatively higher. This is for the case that an encrypted
-# partition and its decrypted DM device have the same label.
-ENV{ID_FS_USAGE}=="crypto", OPTIONS+="link_priority=-10"
-
 # by-label/by-uuid links (filesystem metadata)
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"