!385 [sync] PR-383: change the suffi parameter in lxc attach --help output

Merge pull request !385 from openeuler-sync-bot/sync-pr383-openEuler-22.03-LTS-to-openEuler-22.03-LTS-Next

0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch

@@ -0,0 +1,26 @@
+From 0292c21fc67877e215b9988be497aaf09a9479d6 Mon Sep 17 00:00:00 2001
+From: isuladci <isulad@ci.com>
+Date: Mon, 19 Dec 2022 10:48:07 +0800
+Subject: [PATCH] change the suffi parameter in lxc attach --help output
+
+Signed-off-by: isuladci <isulad@ci.com>
+---
+ 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 0de2067..3cdb4f3 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
+

lxc.spec

@@ -1,4 +1,4 @@
-%global _release 2022102404
+%global _release 2022102405
 
 Name:           lxc
 Version:        4.0.3
@@ -60,6 +60,7 @@ Patch0049:	0049-skip-kill-cgroup-processes-if-no-hierarchies.patch
 Patch0050:	0050-lxc-Add-sw64-architecture.patch
 Patch0051:	0051-add-macro-to-adapt-musl-libc.patch
 Patch0052:	0052-add-lxc-attach-add-gids-option.patch
+Patch0053:	0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)
@@ -240,6 +241,12 @@ make check
 %endif
 
 %changelog
+* Fri Dec 16 2022 huangsong<huangsong14@huawei.com> - 4.0.3-2022102405
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: change the suffi parameter in lxc attach --help output
+
 * Fri Dec 02 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022102404
 - Type:bugfix
 - ID:NA

series.conf

@@ -50,3 +50,4 @@
 0050-lxc-Add-sw64-architecture.patch
 0051-add-macro-to-adapt-musl-libc.patch
 0052-add-lxc-attach-add-gids-option.patch
+0053-change-the-suffi-parameter-in-lxc-attach-help-output.patch