# HG changeset patch
# User Drew Fisher <drew.fisher@oracle.com>
# Date 1444076181 25200
# Node ID f8b5f8d82eecaf2087fc8bcbdd87c3b9462490e6
# Parent  4c88f9d4ab8d393c08a28e0682d683842b765ada
PSARC/2015/417 /etc/rsyslog.d
21937262 Deliver /etc/rsyslog.d

diff -r 4c88f9d4ab8d -r f8b5f8d82eec components/rsyslog/files/rsyslog.conf-solaris
--- a/components/rsyslog/files/rsyslog.conf-solaris	Sat Oct 03 12:39:15 2015 -0700
+++ b/components/rsyslog/files/rsyslog.conf-solaris	Mon Oct 05 13:16:21 2015 -0700
@@ -8,6 +8,8 @@
 #$ModLoad imuxsock	# can be used for rate-limiting and flow-control
 $ModLoad imsolaris	# for Solaris kernel logging
 
+# Read drop-in files from /etc/rsyslog.d
+$IncludeConfig /etc/rsyslog.d/
 
 # High priority messages to the console
 *.err;kern.notice;auth.notice			/dev/sysmsg
diff -r 4c88f9d4ab8d -r f8b5f8d82eec components/rsyslog/rsyslog.p5m
--- a/components/rsyslog/rsyslog.p5m	Sat Oct 03 12:39:15 2015 -0700
+++ b/components/rsyslog/rsyslog.p5m	Mon Oct 05 13:16:21 2015 -0700
@@ -39,10 +39,12 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="Rainer Gerhards"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/197 value=PSARC/2014/388
+set name=org.opensolaris.arc-caseid value=PSARC/2012/197 value=PSARC/2014/388 \
+    value=PSARC/2015/417
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file rsyslog.conf-solaris path=etc/rsyslog.conf owner=root mode=0644 \
     overlay=allow preserve=true
+dir  path=etc/rsyslog.d
 file rsyslog.xml path=lib/svc/manifest/system/rsyslog.xml
 file rsyslog path=lib/svc/method/rsyslog
 file path=usr/lib/rsyslog/imgssapi.so