summaryrefslogtreecommitdiffstats
path: root/rules.d/60-persistent-storage.rules.in
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-04-10 23:01:13 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-04-10 23:07:03 +0200
commit6fdc9fbc0f7e6c30aa01ef7284c29f5ab6b47e93 (patch)
treeebfa3a04e904714a480e4788f876a997c4b06d2c /rules.d/60-persistent-storage.rules.in
parentdevice-nodes: rename argument (diff)
downloadsystemd-6fdc9fbc0f7e6c30aa01ef7284c29f5ab6b47e93.tar.xz
systemd-6fdc9fbc0f7e6c30aa01ef7284c29f5ab6b47e93.zip
udev/scsi_id: rename positional arguments
Diffstat (limited to 'rules.d/60-persistent-storage.rules.in')
-rw-r--r--rules.d/60-persistent-storage.rules.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules.d/60-persistent-storage.rules.in b/rules.d/60-persistent-storage.rules.in
index 51589686af..39dfc2e551 100644
--- a/rules.d/60-persistent-storage.rules.in
+++ b/rules.d/60-persistent-storage.rules.in
@@ -71,8 +71,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", ATTR{removable}=="0", SUBSYSTEMS=
KERNEL=="sd*[!0-9]|sr*", SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
# SCSI devices
-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $devnode", ENV{ID_BUS}="scsi"
-KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $devnode", ENV{ID_BUS}="cciss"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --allowlisted -d $devnode", ENV{ID_BUS}="scsi"
+KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --allowlisted -d $devnode", ENV{ID_BUS}="cciss"
KERNEL=="sd*|sr*|cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="sd*|cciss*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
# Previously, ata_id in the above might not be able to retrieve attributes correctly,