From 081390bfc8cdef20b9b1760ce5d848cdc5c80624 Mon Sep 17 00:00:00 2001 From: Michal Bloch Date: Tue, 28 Jan 2020 12:30:13 +0100 Subject: [PATCH] Critical logs: move to /var/log/dlog The writer binary now has the 'System' smack label to allow this. Change-Id: I2f8486c02caa2e45cff5594b19d3155919ddd1e9 Signed-off-by: Michal Bloch --- packaging/dlog.spec | 10 +++++----- src/log-critical/log-critical.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/dlog.spec b/packaging/dlog.spec index 6665e45..8b6d4a6 100644 --- a/packaging/dlog.spec +++ b/packaging/dlog.spec @@ -154,7 +154,7 @@ cp %{SOURCE101} . --enable-dynamic-filters %endif -make %{?jobs:-j%jobs} CFLAGS+='-D__DLOG_VERSION=\"%{version}\" -D__DLOG_RELEASE=\"%{release}\" -DDLOG_CRITICAL_LOGFILE=\"/var/log/dlog_critical\"' +make %{?jobs:-j%jobs} CFLAGS+='-D__DLOG_VERSION=\"%{version}\" -D__DLOG_RELEASE=\"%{release}\" -DDLOG_CRITICAL_LOGFILE=\"/var/log/dlog/critical\"' # autoconf adds a bunch of flags, including -O2. # Clear those so that test coverage can be measured properly @@ -246,10 +246,10 @@ chsmack %{_bindir}/dlogctl -a "System::Tools" /sbin/ldconfig systemctl daemon-reload chsmack -a System /var/log/dlog -touch /var/log/dlog_critical -chmod 660 /var/log/dlog_critical -chown log:log /var/log/dlog_critical -chsmack -a '*' /var/log/dlog_critical +touch /var/log/dlog/critical +chmod 660 /var/log/dlog/critical +chown log:log /var/log/dlog/critical +chsmack -e 'System' %{_libexecdir}/dlog-log-critical %postun -n libdlog -p /sbin/ldconfig diff --git a/src/log-critical/log-critical.c b/src/log-critical/log-critical.c index 4eb2cfe..7f22d27 100644 --- a/src/log-critical/log-critical.c +++ b/src/log-critical/log-critical.c @@ -22,7 +22,7 @@ #include #ifndef DLOG_CRITICAL_LOGFILE - #define DLOG_CRITICAL_LOGFILE "/var/log/dlog_critical" + #define DLOG_CRITICAL_LOGFILE "/var/log/dlog/critical" #endif int main (int argc, char **argv) -- 2.7.4