From 5edcc82d357ff98e9b53bf9e8f60cc2ca6d6c25d Mon Sep 17 00:00:00 2001 From: zhanghongtao Date: Sat, 8 Oct 2022 20:09:34 +0800 Subject: [PATCH] bash Fix nvme completion (cherry picked from commit 8aa0343b89c6d8638fb4fe32177407fb1d99ba94) --- 0001-bash-Fix-nvme-completion.patch | 36 +++++++++++++++++++++++++++++ nvme-cli.spec | 6 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-bash-Fix-nvme-completion.patch diff --git a/0001-bash-Fix-nvme-completion.patch b/0001-bash-Fix-nvme-completion.patch new file mode 100644 index 0000000..38c58cb --- /dev/null +++ b/0001-bash-Fix-nvme-completion.patch @@ -0,0 +1,36 @@ +From 821935cccfcad6b18da78d42f9ddf49f4cbe0b8e Mon Sep 17 00:00:00 2001 +From: Daniel Wagner +Date: Thu, 9 Dec 2021 15:40:26 +0100 +Subject: [PATCH] bash: Fix nvme completion + +Signed-off-by: Daniel Wagner +--- + completions/bash-nvme-completion.sh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh +index 41938d77..902da01c 100644 +--- a/completions/bash-nvme-completion.sh ++++ b/completions/bash-nvme-completion.sh +@@ -101,8 +101,7 @@ _cmds="list list-subsys id-ctrl id-ns \ + connect disconnect disconnect-all gen-hostnqn \ + show-hostnqn dir-receive dir-send virt-mgmt \ + rpmb boot-part-log fid-support-effects-log \ +- supported-log-pages lockdown" +- supported-log-pages list-endgrp" ++ supported-log-pages lockdown list-endgrp" + + # Add plugins: + for plugin in "${!_plugin_subcmds[@]}"; do +@@ -1368,7 +1367,7 @@ plugin_ymtc_opts () { + opts+=" --namespace-id= -n --raw-binary -b" + ;; + "help") +- opts+=NO_OPTS ++ opts+=$NO_OPTS + ;; + esac + +-- +2.33.0 + diff --git a/nvme-cli.spec b/nvme-cli.spec index 8c32cec..903767d 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,11 +1,12 @@ Name: nvme-cli Version: 1.16 -Release: 1 +Release: 2 Summary: NVMe management command line interface License: GPLv2+ URL: https://github.com/linux-nvme/nvme-cli Source0: https://github.com/linux-nvme/%{name}/archive/v%{version}.tar.gz +Patch1: 0001-bash-Fix-nvme-completion.patch BuildRequires: libuuid-devel gcc make systemd-devel @@ -50,6 +51,9 @@ rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf %{_mandir}/man1/nvme*.gz %changelog +* Sat Oct 8 2022 zhanghongtao - 1.16-2 +- bash Fix nvme completion + * Wed Dec 29 2021 baizhonggui - 1.16-1 - update to 1.16 -- Gitee