From cbd7cbd1f11e2bf1229f4a53096678410bbc549f Mon Sep 17 00:00:00 2001 From: haozi007 Date: Sat, 8 May 2021 14:34:38 +0800 Subject: [PATCH] support long syslog tag Signed-off-by: haozi007 (cherry picked from commit a13f6581f4a2462c864a844a659c570a342bff54) --- 0023-log-support-long-syslog-tag.patch | 32 ++++++++++++++++++++++++++ lxc.spec | 9 +++++++- series.conf | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0023-log-support-long-syslog-tag.patch diff --git a/0023-log-support-long-syslog-tag.patch b/0023-log-support-long-syslog-tag.patch new file mode 100644 index 0000000..a662c6d --- /dev/null +++ b/0023-log-support-long-syslog-tag.patch @@ -0,0 +1,32 @@ +From 17d87a933dd7e3744a68c61aaec21aedebce3440 Mon Sep 17 00:00:00 2001 +From: haozi007 +Date: Thu, 21 Jan 2021 11:06:31 +0800 +Subject: [PATCH] log: support long syslog tag + +Signed-off-by: haozi007 +--- + 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 + diff --git a/lxc.spec b/lxc.spec index 25279c2..96bb300 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2021050801 +%global _release 2021050802 Name: lxc 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 Patch0021: 0021-support-isula-exec-workdir.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: pkgconfig(libseccomp) @@ -201,6 +202,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Sat Mar 08 2021 haozi007 - 4.0.3-2021050802 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:support long syslog tag + * Sat Mar 08 2021 wangfengtu - 4.0.3-2021050801 - Type:bugfix - ID:NA diff --git a/series.conf b/series.conf index efe3aae..959704d 100644 --- a/series.conf +++ b/series.conf @@ -20,3 +20,4 @@ 0020-support-cgroup-v2.patch 0021-support-isula-exec-workdir.patch 0022-print-error-message-if-process-workdir-failed.patch +0023-log-support-long-syslog-tag.patch -- Gitee