!342 fix tools using -? option give error
From: @driedyellowpeach Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
This commit is contained in:
commit
669713d7a8
25
0014-fix-tools-using-option-give-error-message.patch
Normal file
25
0014-fix-tools-using-option-give-error-message.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From cce266a71a8998e17abada2a7e716298c2169208 Mon Sep 17 00:00:00 2001
|
||||
From: Neil.wrz<wangrunze13@huawei.com>
|
||||
Date: Thu, 1 Sep 2022 05:04:56 -0700
|
||||
Subject: [PATCH] fix tools using '-?' option give error message
|
||||
|
||||
Signed-off-by: Neil.wrz<wangrunze13@huawei.com>
|
||||
---
|
||||
src/lxc/tools/arguments.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
|
||||
index c16d99f..80c2083 100644
|
||||
--- a/src/lxc/tools/arguments.h
|
||||
+++ b/src/lxc/tools/arguments.h
|
||||
@@ -145,6 +145,7 @@ struct lxc_arguments {
|
||||
#define LXC_COMMON_OPTIONS \
|
||||
{ "name", required_argument, 0, 'n' }, \
|
||||
{ "help", no_argument, 0, 'h' }, \
|
||||
+ { "help", no_argument, 0, '?' }, \
|
||||
{ "usage", no_argument, 0, OPT_USAGE }, \
|
||||
{ "version", no_argument, 0, OPT_VERSION }, \
|
||||
{ "quiet", no_argument, 0, 'q' }, \
|
||||
--
|
||||
2.25.1
|
||||
|
||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
||||
%global _release 2022090101
|
||||
%global _release 2022090201
|
||||
|
||||
Name: lxc
|
||||
Version: 4.0.3
|
||||
@ -21,6 +21,7 @@ Patch0010: 0010-check-yajl-only-when-have-isulad.patch
|
||||
Patch0011: 0011-drop-security_context_t.patch
|
||||
Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch
|
||||
Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
|
||||
Patch0014: 0014-fix-tools-using-option-give-error-message.patch
|
||||
|
||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
@ -192,6 +193,12 @@ make check
|
||||
%{_mandir}/*/man7/%{name}*
|
||||
|
||||
%changelog
|
||||
* Fri Sep 2 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022090201
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: fix tools using -? option give error
|
||||
|
||||
* Thu Sep 1 2022 zhongtao<zhongtao17@huawei.com> - 4.0.3-2022090101
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
@ -11,3 +11,4 @@
|
||||
0011-drop-security_context_t.patch
|
||||
0012-only-set-user-or-image-set-non-empty-HOME.patch
|
||||
0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
|
||||
0014-fix-tools-using-option-give-error-message.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user