From 589986012c4b3ab68e299a2eadca18f90080113b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Jul 2022 20:28:04 +0200 Subject: Merging upstream version 2.0. Signed-off-by: Daniel Baumann --- nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules | 19 ------------------- .../udev-rules/70-nvmf-autoconnect.rules.in | 19 +++++++++++++++++++ .../udev-rules/71-nvmf-iopolicy-netapp.rules | 3 --- .../udev-rules/71-nvmf-iopolicy-netapp.rules.in | 3 +++ 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in delete mode 100644 nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules create mode 100644 nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in (limited to 'nvmf-autoconnect/udev-rules') diff --git a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules deleted file mode 100644 index cbbebc5..0000000 --- a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules +++ /dev/null @@ -1,19 +0,0 @@ -# -# nvmf-autoconnect.rules: -# Handles udev events which invoke automatically scan via discovery -# controller and connect to elements in the discovery log. -# -# - -# Events from persistent discovery controllers or nvme-fc transport events -# NVME_AEN: -# type 0x2 (NOTICE) info 0xf0 (DISCOVERY_LOG_CHANGE) log-page-id 0x70 (DISCOVERY_LOG_PAGE) -ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_AEN}=="0x70f002",\ - ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ - ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ - RUN+="/bin/systemctl --no-block start nvmf-connect@--device=$kernel\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" - -# nvme-fc transport generated events (old-style for compatibility) -ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ - ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ - RUN+="/bin/systemctl --no-block start nvmf-connect@--device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" diff --git a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in new file mode 100644 index 0000000..434cc08 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules.in @@ -0,0 +1,19 @@ +# +# nvmf-autoconnect.rules: +# Handles udev events which invoke automatically scan via discovery +# controller and connect to elements in the discovery log. +# +# + +# Events from persistent discovery controllers or nvme-fc transport events +# NVME_AEN: +# type 0x2 (NOTICE) info 0xf0 (DISCOVERY_LOG_CHANGE) log-page-id 0x70 (DISCOVERY_LOG_PAGE) +ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_AEN}=="0x70f002",\ + ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ + ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ + RUN+="@SYSTEMCTL@ --no-block start nvmf-connect@--device=$kernel\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" + +# nvme-fc transport generated events (old-style for compatibility) +ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ + ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ + RUN+="@SYSTEMCTL@ --no-block start nvmf-connect@--device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" diff --git a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules deleted file mode 100644 index aefd9d4..0000000 --- a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules +++ /dev/null @@ -1,3 +0,0 @@ -# Enable round-robin for NetApp ONTAP and NetApp E-Series -ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp ONTAP Controller", ATTR{iopolicy}="round-robin" -ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp E-Series", ATTR{iopolicy}="round-robin" diff --git a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in new file mode 100644 index 0000000..aefd9d4 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules.in @@ -0,0 +1,3 @@ +# Enable round-robin for NetApp ONTAP and NetApp E-Series +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp ONTAP Controller", ATTR{iopolicy}="round-robin" +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp E-Series", ATTR{iopolicy}="round-robin" -- cgit v1.2.3