starlingx/integ
Code Issues Proposed changes

rebase systemd patch to CentOS 7.6 version

Browse Source 
Test:
Build pass with build pkgs and build iso, and then build rpms for installer,
update installer and rebuild iso again. And deploy multi-node test pass.

Depends-On: https://review.openstack.org/628732/

Story: 2004522
Task: 28439

Change-Id: I58affb58f08254dc82695bc524c964f01bf10c69
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
This commit is contained in:
Martin, Chen
2019-01-05 22:51:47 +08:00
parent 0c58aee440
commit 4772b5af3a
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch
View File

@@ -56,7 +56,7 @@ index 4e118aa..85cdeb9 100644
static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, const struct ucred *ucred, const struct timeval *tv) {
static const union sockaddr_union sa = {
@@ -143,13 +181,11 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
@@ -145,13 +183,11 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
xsprintf(header_priority, "<%i>", priority);
IOVEC_SET_STRING(iovec[n++], header_priority);

2
base/systemd/centos/patches/0702-fix-build-error-for-unused-variable.patch
View File

@@ -12,7 +12,7 @@ diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 33062ea..fd4e070 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -165,8 +165,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
@@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
char header_priority[DECIMAL_STR_MAX(priority) + 3], header_time[64],
header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t) + 1];
int n = 0;