rsyslogd: Install default server config
This reverts commit 37bc1a3568f2e87987be05243627a984dc051de1.
In addition, it changes the default rsyslog server config to
ignore all messages. Also bumps up phosphor-logging:
phosphor-logging: srcrev bump f59854e94b..0a0b5ea558
Santosh Puranik (1):
rsyslod: Change disable action
Tested:
Verified that the default rsyslog behavior is to now ignore
all messages.
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: I2342fad00306d6d39042e243c4be8ebee8cd54b4
diff --git a/recipes-extended/rsyslog/files/rsyslog-override.conf b/recipes-extended/rsyslog/files/rsyslog-override.conf
deleted file mode 100644
index 458f52f..0000000
--- a/recipes-extended/rsyslog/files/rsyslog-override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-# This file exists only if remote logging has been configured
-ConditionPathExists=/etc/rsyslog.d/server.conf
diff --git a/recipes-extended/rsyslog/rsyslog/server.conf b/recipes-extended/rsyslog/rsyslog/server.conf
new file mode 100644
index 0000000..cf47ba3
--- /dev/null
+++ b/recipes-extended/rsyslog/rsyslog/server.conf
@@ -0,0 +1 @@
+*.* ~
diff --git a/recipes-extended/rsyslog/rsyslog_%.bbappend b/recipes-extended/rsyslog/rsyslog_%.bbappend
index 3901844..0a2fb33 100644
--- a/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/recipes-extended/rsyslog/rsyslog_%.bbappend
@@ -2,9 +2,15 @@
SRC_URI += " \
file://rsyslog.conf \
+ file://server.conf \
"
PACKAGECONFIG ??= " \
rsyslogd rsyslogrt inet regexp uuid \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"
+
+do_install_append(){
+ install -m 0644 -D ${WORKDIR}/server.conf \
+ ${D}${sysconfdir}/rsyslog.d/server.conf
+}
diff --git a/recipes-phosphor/logging/phosphor-logging_git.bb b/recipes-phosphor/logging/phosphor-logging_git.bb
index 89d71ae..f710ed0 100644
--- a/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -53,7 +53,7 @@
"
SRC_URI += "git://github.com/openbmc/phosphor-logging"
-SRCREV = "f59854e94b077630200117b390c4e943d588be31"
+SRCREV = "0a0b5ea558adeb109a3ac52e55ad720e188adb90"
S = "${WORKDIR}/git"
diff --git a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index c783d00..238ee29 100644
--- a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -92,7 +92,6 @@
SUMMARY_${PN}-remote-logging = "Remote logging applications"
RDEPENDS_${PN}-remote-logging = " \
rsyslog \
- rsyslog-policy \
phosphor-rsyslog-config \
"