mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-08 21:17:47 +03:00
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.
This commit is contained in:
parent
b87b01cf83
commit
0c13be389f
@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
|
|||||||
SUBSYSTEM!="block", GOTO="persistent_storage_end"
|
SUBSYSTEM!="block", GOTO="persistent_storage_end"
|
||||||
|
|
||||||
# skip rules for inappropriate block devices
|
# 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
|
# ignore partitions that span the entire disk
|
||||||
TEST=="whole_disk", GOTO="persistent_storage_end"
|
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)
|
# by-path (parent device path)
|
||||||
ENV{DEVTYPE}=="disk", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
|
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}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
|
||||||
ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", KERNEL!="mmcblk[0-9]*rpmb", SYMLINK+="disk/by-path/$env{ID_PATH}"
|
|
||||||
ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
|
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
|
# 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}=="", \
|
KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", \
|
||||||
IMPORT{builtin}="blkid --noraid"
|
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
|
# probe filesystem metadata of disks
|
||||||
KERNEL!="sr*", IMPORT{builtin}="blkid"
|
KERNEL!="sr*", IMPORT{builtin}="blkid"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user