!140 support long syslog tag
From: @duguhaotian Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1
This commit is contained in:
commit
93668a0cf3
32
0023-log-support-long-syslog-tag.patch
Normal file
32
0023-log-support-long-syslog-tag.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 17d87a933dd7e3744a68c61aaec21aedebce3440 Mon Sep 17 00:00:00 2001
|
||||||
|
From: haozi007 <liuhao27@huawei.com>
|
||||||
|
Date: Thu, 21 Jan 2021 11:06:31 +0800
|
||||||
|
Subject: [PATCH] log: support long syslog tag
|
||||||
|
|
||||||
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
||||||
|
---
|
||||||
|
src/lxc/confile.c | 5 +----
|
||||||
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
|
||||||
|
index f108b37b..e898e23b 100644
|
||||||
|
--- a/src/lxc/confile.c
|
||||||
|
+++ b/src/lxc/confile.c
|
||||||
|
@@ -6634,13 +6634,10 @@ static int set_config_console_log_driver(const char *key, const char *value,
|
||||||
|
static int set_config_console_syslog_tag(const char *key, const char *value,
|
||||||
|
struct lxc_conf *lxc_conf, void *data)
|
||||||
|
{
|
||||||
|
- char buf[16] = { 0 };
|
||||||
|
-
|
||||||
|
if (value == NULL) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- (void)strlcpy(buf, value, 16);
|
||||||
|
- return set_config_string_item(&lxc_conf->console.log_syslog_tag, buf);
|
||||||
|
+ return set_config_string_item(&lxc_conf->console.log_syslog_tag, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int parse_facility(const char *facility)
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
|||||||
%global _release 2021050801
|
%global _release 2021050802
|
||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 4.0.3
|
Version: 4.0.3
|
||||||
@ -30,6 +30,7 @@ Patch0019: 0019-metrics-add-total_inactive_file-metric-for-memory.patch
|
|||||||
Patch0020: 0020-support-cgroup-v2.patch
|
Patch0020: 0020-support-cgroup-v2.patch
|
||||||
Patch0021: 0021-support-isula-exec-workdir.patch
|
Patch0021: 0021-support-isula-exec-workdir.patch
|
||||||
Patch0022: 0022-print-error-message-if-process-workdir-failed.patch
|
Patch0022: 0022-print-error-message-if-process-workdir-failed.patch
|
||||||
|
Patch0023: 0023-log-support-long-syslog-tag.patch
|
||||||
|
|
||||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||||
BuildRequires: pkgconfig(libseccomp)
|
BuildRequires: pkgconfig(libseccomp)
|
||||||
@ -201,6 +202,12 @@ make check
|
|||||||
%{_mandir}/*/man7/%{name}*
|
%{_mandir}/*/man7/%{name}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Mar 08 2021 haozi007 <liuhao27@huawei.com> - 4.0.3-2021050802
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:support long syslog tag
|
||||||
|
|
||||||
* Sat Mar 08 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021050801
|
* Sat Mar 08 2021 wangfengtu <wangfengtu@huawei.com> - 4.0.3-2021050801
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -20,3 +20,4 @@
|
|||||||
0020-support-cgroup-v2.patch
|
0020-support-cgroup-v2.patch
|
||||||
0021-support-isula-exec-workdir.patch
|
0021-support-isula-exec-workdir.patch
|
||||||
0022-print-error-message-if-process-workdir-failed.patch
|
0022-print-error-message-if-process-workdir-failed.patch
|
||||||
|
0023-log-support-long-syslog-tag.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user