Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nvme-cli for openSUSE:Factory checked in at 2026-06-17 16:16:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvme-cli (Old) and /work/SRC/openSUSE:Factory/.nvme-cli.new.1981 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvme-cli" Wed Jun 17 16:16:54 2026 rev:88 rq:1359774 version:2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/nvme-cli/nvme-cli.changes 2026-02-16 15:09:25.212749902 +0100 +++ /work/SRC/openSUSE:Factory/.nvme-cli.new.1981/nvme-cli.changes 2026-06-17 16:17:32.865126413 +0200 @@ -1,0 +2,10 @@ +Tue Jun 16 11:54:00 UTC 2026 - Daniel Wagner <[email protected]> + +- fabrics: add helper to update tls and concat (bsc#1259672) +- nvmf-autoconnect: add NetworkManager dispatcher script (jsc#PED-14314) +- updated spec: + * add 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch + * add 0002-fabrics-add-helper-to-update-tls-and-concat.patch + * install 80-nvmf-connect-nbft.sh + +------------------------------------------------------------------- New: ---- 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch 0002-fabrics-add-helper-to-update-tls-and-concat.patch ----------(New B)---------- New:- updated spec: * add 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch * add 0002-fabrics-add-helper-to-update-tls-and-concat.patch New: * add 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch * add 0002-fabrics-add-helper-to-update-tls-and-concat.patch * install 80-nvmf-connect-nbft.sh ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvme-cli.spec ++++++ --- /var/tmp/diff_new_pack.YTNoS1/_old 2026-06-17 16:17:33.969172617 +0200 +++ /var/tmp/diff_new_pack.YTNoS1/_new 2026-06-17 16:17:33.969172617 +0200 @@ -27,6 +27,8 @@ URL: https://github.com/linux-nvme/nvme-cli/ Source0: nvme-cli-%{version}.tar.gz Source1: nvme-cli-rpmlintrc +Patch0: 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch +Patch1: 0002-fabrics-add-helper-to-update-tls-and-concat.patch BuildRequires: asciidoc BuildRequires: gcc BuildRequires: gcc-c++ @@ -180,6 +182,9 @@ %{_unitdir}/nvmf-connect-nbft.service %{_unitdir}/nvmf-connect.target %{_unitdir}/[email protected] +%dir %{_prefix}/lib/NetworkManager +%dir %{_prefix}/lib/NetworkManager/dispatcher.d +%{_prefix}/lib/NetworkManager/dispatcher.d/80-nvmf-connect-nbft.sh %dir %{_sysconfdir}/nvme/ %ghost %{_sysconfdir}/nvme/hostnqn %ghost %{_sysconfdir}/nvme/hostid ++++++ 0001-nvmf-autoconnect-add-NetworkManager-dispatcher-scrip.patch ++++++ >From 979201ab0b851ec1df783e544e9008cedd0ad0fd Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Fri, 27 Feb 2026 18:05:41 +0100 Subject: nvmf-autoconnect: add NetworkManager dispatcher script If an interface is brought up that is configured in the NVMeoF Boot Firmware Table (NBFT), we need to establish possibly missing NVMe connections from the NBFT. This can happen if an interface couldn't be brought up during initramfs processing, but is activated later on. Add a NM-dispatcher script that takes care of the connection attempt. Signed-off-by: Martin Wilck <[email protected]> --- meson.build | 16 +++++++++++ meson_options.txt | 6 +++++ .../nm-dispatcher/80-nvmf-connect-nbft.sh.in | 27 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 nvmf-autoconnect/nm-dispatcher/80-nvmf-connect-nbft.sh.in diff --git a/meson.build b/meson.build index 0633325742eb..b25e285bd285 100644 --- a/meson.build +++ b/meson.build @@ -27,6 +27,7 @@ sysconfdir = join_paths(prefixdir, get_option('sysconfdir')) udevrulesdir = join_paths(prefixdir, get_option('udevrulesdir')) dracutrulesdir = join_paths(prefixdir, get_option('dracutrulesdir')) systemddir = join_paths(prefixdir, get_option('systemddir')) +nmdispatchdir = join_paths(prefixdir, get_option('nmdispatchdir')) rundir = join_paths(prefixdir, get_option('rundir')) ############################################################################### @@ -280,6 +281,21 @@ foreach file : udev_files ) endforeach +nm_dispatcher_files = [ + '80-nvmf-connect-nbft.sh' +] + +foreach file : nm_dispatcher_files + configure_file( + input: 'nvmf-autoconnect/nm-dispatcher/' + file + '.in', + output: file, + configuration: substs, + install: true, + install_mode: 'rwxr-xr-x', + install_dir: nmdispatchdir + ) +endforeach + ################################################################################ add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE', '-include', 'config.h'], language : 'c') diff --git a/meson_options.txt b/meson_options.txt index c61dae0fff56..d98c11b5de41 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -65,6 +65,12 @@ option( value : 'lib/udev/rules.d', description : 'directory for udev rules files' ) +option( + 'nmdispatchdir', + type : 'string', + value : 'lib/NetworkManager/dispatcher.d', + description : 'directory for NetworkManager dispatcher scripts' +) option( 'version-tag', type : 'string', diff --git a/nvmf-autoconnect/nm-dispatcher/80-nvmf-connect-nbft.sh.in b/nvmf-autoconnect/nm-dispatcher/80-nvmf-connect-nbft.sh.in new file mode 100644 index 000000000000..38b9f88c9883 --- /dev/null +++ b/nvmf-autoconnect/nm-dispatcher/80-nvmf-connect-nbft.sh.in @@ -0,0 +1,27 @@ +#! /bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# +# If an interface is brought up that is configured in the NVMeoF +# Boot Firmware Table (NBFT), try to establish possibly missing +# NVMe connections from the NBFT. +# This can happen if an interface couldn't be brought up during +# initramfs processing, but is activated later on. + +start_nvmf= + +if [ "$2" = up ]; then + case $1 in + nbft*) + start_nvmf=yes + ;; + esac + case $CONNECTION_ID in + "NBFT connection HFI"*) + start_nvmf=yes + ;; + esac +fi + +if [ "$start_nvmf" ]; then + @SYSTEMCTL@ --no-block start nvmf-connect-nbft.service || true +fi -- 2.54.0 ++++++ 0002-fabrics-add-helper-to-update-tls-and-concat.patch ++++++ >From 881f14769acec9a136491a649ee52f455a5c8e20 Mon Sep 17 00:00:00 2001 From: Daniel Wagner <[email protected]> Date: Thu, 9 Apr 2026 15:17:30 +0200 Subject: fabrics: add helper to update tls and concat Only --tls was properly updated in nbft_connect(), and not --concat. But this is properly done in nvmf_connect_disc_entry() already. So add a helper function to update both --tls and --concat and invoke the same from nvmf_connect_disc_entry() and nbft_connect() respectively. Signed-off-by: Martin George <[email protected]> [wagi: reformated the function to improve readability] (cherry picked from 99dd46fdff25) Signed-off-by: Daniel Wagner <[email protected]> (cherry picked from commit 4963779e6b25aa02dd6c1541b6046a59f9ef9607) Signed-off-by: Daniel Wagner <[email protected]> --- nbft.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/nbft.c b/nbft.c index b5c82b07ca2b..26758b550656 100644 --- a/nbft.c +++ b/nbft.c @@ -103,6 +103,34 @@ static bool validate_uri(struct nbft_info_discovery *dd, return true; } +static void update_tls_concat(struct nvmf_disc_log_entry *e, + struct nvme_fabrics_config *cfg) +{ + if (e->trtype != NVMF_TRTYPE_TCP || + e->tsas.tcp.sectype == NVMF_TCP_SECTYPE_NONE) + return; + + if (e->treq & NVMF_TREQ_REQUIRED) { + fprintf(stderr, + "setting --tls due to treq %s and sectype %s\n", + nvmf_treq_str(e->treq), + nvmf_sectype_str(e->tsas.tcp.sectype)); + + cfg->tls = true; + return; + } + + if (e->treq & NVMF_TREQ_NOT_REQUIRED) { + fprintf(stderr, + "setting --concat due to treq %s and sectype %s\n", + nvmf_treq_str(e->treq), + nvmf_sectype_str(e->tsas.tcp.sectype)); + + cfg->concat = true; + return; + } +} + /* returns 0 for success or negative errno otherwise */ static int do_connect(nvme_root_t r, nvme_host_t h, @@ -138,11 +166,8 @@ static int do_connect(nvme_root_t r, nvme_init_logging(r, -1, false, false); } - if (e) { - if (e->trtype == NVMF_TRTYPE_TCP && - e->tsas.tcp.sectype != NVMF_TCP_SECTYPE_NONE) - cfg->tls = true; - } + /* Update tls or concat */ + update_tls_concat(e, cfg); errno = 0; ret = nvmf_add_ctrl(h, c, cfg); -- 2.54.0
