From f6aa977a30131f961639e7ceae17b0fa02bb1719 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 20 Apr 2021 17:49:14 +0900 Subject: [PATCH] Temporarily remove dlog_connect_fd() Change-Id: Iba815676531a7561c4c4f7c12263464b1dba7f22 Signed-off-by: Hyotaek Shim --- meson.build | 2 +- packaging/systemd.spec | 2 +- src/core/execute.c | 7 ++++--- src/core/meson.build | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 98d333b..003bf2a 100644 --- a/meson.build +++ b/meson.build @@ -859,7 +859,7 @@ if not libcap.found() libcap = cc.find_library('cap') endif -libdlog_redirect_stdout = dependency('dlog-redirect-stdout', required : true) +#libdlog_redirect_stdout = dependency('dlog-redirect-stdout', required : true) libmount = dependency('mount', version : fuzzer_build ? '>= 0' : '>= 2.30') diff --git a/packaging/systemd.spec b/packaging/systemd.spec index 35b9432..7e0ecaf 100644 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -84,7 +84,7 @@ BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(mount) BuildRequires: pkgconfig(libdbuspolicy1) -BuildRequires: pkgconfig(dlog-redirect-stdout) +#BuildRequires: pkgconfig(dlog-redirect-stdout) BuildRequires: meson BuildRequires: acl BuildRequires: python diff --git a/src/core/execute.c b/src/core/execute.c index fc0146a..6f358ef 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -14,7 +14,7 @@ #include #include -#include +//#include #if HAVE_PAM #include @@ -588,8 +588,9 @@ static int wire_up_dlog(int fileno, const char *ident) snprintf(tag, sizeof tag, "STDOUT_%s", ident); } - return dlog_connect_fd(2, // SYSTEM dlog buffer (consider also 0 for generic MAIN buffer) - fileno, tag, priority); + return -1; + //return dlog_connect_fd(2, // SYSTEM dlog buffer (consider also 0 for generic MAIN buffer) + //fileno, tag, priority); } static int setup_output( diff --git a/src/core/meson.build b/src/core/meson.build index a7afe19..219f00b 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -181,7 +181,7 @@ libcore = static_library( libkmod, libapparmor, libselinux, - libdlog_redirect_stdout, +#libdlog_redirect_stdout, libmount]) systemd_sources = files('main.c') -- 2.7.4