diff options
| author |   Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-13 10:59:38 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-13 10:59:38 +0100 |
| commit | 0c13be389faea49fd8a370dc8186e7d5d20e967d (patch) | |
| tree | aa10847ac6f36e6de967cb082c58b88a6ea1f930 /rules | |
| parent | rules: Fix by-path of mmc RPMB partitions and don't blkid them (diff) | |
| download | systemd-0c13be389faea49fd8a370dc8186e7d5d20e967d.tar.gz systemd-0c13be389faea49fd8a370dc8186e7d5d20e967d.tar.bz2 systemd-0c13be389faea49fd8a370dc8186e7d5d20e967d.zip | |
rules: simplify mmc RPMB handling
We don't actually want a by-path/ symlink for MMC RPMB devices, so just add
them to the blacklist. This will prevent creating wrong by-path links and
blkid'ing those.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/60-persistent-storage.rules | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 08ed1ccf7..25b44a55c 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ SUBSYSTEM!="block", GOTO="persistent_storage_end" # skip rules for inappropriate block devices -KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*", GOTO="persistent_storage_end" +KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*|mmcblk[0-9]*rpmb", GOTO="persistent_storage_end" # ignore partitions that span the entire disk TEST=="whole_disk", GOTO="persistent_storage_end" @@ -53,8 +53,7 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+= # by-path (parent device path) ENV{DEVTYPE}=="disk", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id" -ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", KERNEL=="mmcblk[0-9]*rpmb", SYMLINK+="disk/by-path/$env{ID_PATH}-rpmb" -ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", KERNEL!="mmcblk[0-9]*rpmb", SYMLINK+="disk/by-path/$env{ID_PATH}" +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" # skip unpartitioned removable media devices from drivers which do not send "change" events @@ -67,9 +66,6 @@ KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DAT KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", \ IMPORT{builtin}="blkid --noraid" -# don't try to read Replay Protected Memory Block partitions -KERNEL=="mmcblk[0-9]*rpmb", GOTO="persistent_storage_end" - # probe filesystem metadata of disks KERNEL!="sr*", IMPORT{builtin}="blkid" |