fix(nvmf): support new nbft connect and show commands

The nvme connect-nbft command has been replaced with nvme connect-all. The nvme show-nbft command has been replaced with nvme nbft show.
timberland-sig · Apr 7, 2023 · 3869355 · 3869355
1 parent 188160b
commit 3869355
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules.d/95nvmf/nvmf-autoconnect.sh b/modules.d/95nvmf/nvmf-autoconnect.sh
@@ -17,7 +17,7 @@ if [ -e /tmp/nvmf-fc-auto ] && [ "$NVMF_HOSTNQN_OK" ] \
 fi
 if [ -e /tmp/valid_nbft_entry_found ]; then
     # prio 2: NBFT
-    /usr/sbin/nvme connect-nbft
+    /usr/sbin/nvme connect-all
     [ "$1" = timeout ] || exit 0
 fi
 if [ -f /etc/nvme/discovery.conf ] && [ $NVMF_HOSTNQN_OK ]; then

diff --git a/modules.d/95nvmf/parse-nvmf-boot-connections.sh b/modules.d/95nvmf/parse-nvmf-boot-connections.sh
@@ -201,7 +201,7 @@ nbft_parse() {
     local nbft_json n_nbft all_hfi_json n_hfi
     local j=0 i
 
-    nbft_json=$(nvme show-nbft -H -o json) || return 0
+    nbft_json=$(nvme nbft show -H -o json) || return 0
     n_nbft=$(nbft_run_jq ". | length" "$nbft_json") || return 0
 
     while [ "$j" -lt "$n_nbft" ]; do