aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Crawford <alex.crawford@coreos.com>2015-06-10 13:12:02 -0700
committerAnthony G. Basile <blueness@gentoo.org>2015-07-20 07:17:36 -0400
commit73c2d3cd6d243fe2b1b77aa0096c4e8aad504565 (patch)
treedda44bbe5df059d9397abf5eeba1418ead35ecd0
parentrules: whitelist xvd* devices (diff)
downloadeudev-73c2d3cd6d243fe2b1b77aa0096c4e8aad504565.tar.gz
eudev-73c2d3cd6d243fe2b1b77aa0096c4e8aad504565.tar.bz2
eudev-73c2d3cd6d243fe2b1b77aa0096c4e8aad504565.zip
rules: re-add cciss rules
The original commit (1aff206) doesn't explain why these were removed. This adds them back since they are in fact needed. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--rules/60-persistent-storage.rules5
1 files changed, 3 insertions, 2 deletions
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 2daeb6db4..71b8e46ae 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -32,8 +32,9 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{builtin
# SCSI devices
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $devnode", ENV{ID_BUS}="scsi"
-KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -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"
# FireWire
KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$attr{ieee1394_id}"