From 36bad830837d0fb3606c16414b7ae614c552515c Mon Sep 17 00:00:00 2001 From: songbuhuang <544824346@qq.com> Date: Fri, 16 Dec 2022 19:28:32 +0800 Subject: [PATCH] change the suffi parameter in lxc attach --help output Signed-off-by: songbuhuang <544824346@qq.com> --- ...-parameter-in-lxc-attach-help-output.patch | 26 +++++++++++++++++++ lxc.spec | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch diff --git a/0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch b/0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch new file mode 100644 index 0000000..6fe236a --- /dev/null +++ b/0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch @@ -0,0 +1,26 @@ +From 026fea0b424c20c867be1577f5d98bc7bf97ba5a Mon Sep 17 00:00:00 2001 +From: isuladci +Date: Fri, 16 Dec 2022 19:17:11 +0800 +Subject: [PATCH] change the --suffi parameter in lxc-attach --help output + +Signed-off-by: isuladci +--- + src/lxc/tools/lxc_attach.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c +index f6ddf2d..fc0529a 100644 +--- a/src/lxc/tools/lxc_attach.c ++++ b/src/lxc/tools/lxc_attach.c +@@ -151,7 +151,7 @@ Options :\n\ + --in-fifo Stdin fifo path\n\ + --out-fifo Stdout fifo path\n\ + --err-fifo Stderr fifo path\n\ +- --suffi ID for mutli-attach on one container\n\ ++ --suffix ID for mutli-attach on one container\n\ + --timeout Timeout in seconds (default: 0)\n\ + --disable-pty Disable pty for attach\n\ + --open-stdin Open stdin for attach\n\ +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index 29229a8..f470730 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022102405 +%global _release 2022102406 Name: lxc Version: 4.0.3 @@ -28,6 +28,7 @@ Patch0017: 0017-lxc-Add-sw64-architecture.patch Patch0018: 0018-add-macro-to-adapt-musl-libc.patch Patch0019: 0019-add-lxc-attach-add-gids-option.patch Patch0020: 0020-add-sscanf-adapation-code-for-musl.patch +Patch0021: 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -208,6 +209,12 @@ make check %endif %changelog +* Fri Dec 16 2022 huangsong - 4.0.3-2022102406 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: change the suffi parameter in lxc attach --help output + * Thu Dec 08 2022 zhongtao - 4.0.3-2022102405 - Type:bugfix - ID:NA -- Gitee