Browse code
rsyslog : $IncludeConfig need a valid folder.
Change-Id: Ifd244fbdefc9aa147f33d3f4d62c5b32e7e074cc
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5083
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Xiaolin Li authored on 2018/04/25 09:47:27Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Rocket-fast system for log processing |
| 2 | 2 |
Name: rsyslog |
| 3 | 3 |
Version: 8.26.0 |
| 4 |
-Release: 5%{?dist}
|
|
| 4 |
+Release: 6%{?dist}
|
|
| 5 | 5 |
License: GPLv3+ and ASL 2.0 |
| 6 | 6 |
URL: http://www.rsyslog.com/ |
| 7 | 7 |
Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
|
| ... | ... |
@@ -55,6 +55,7 @@ rm -f %{buildroot}/lib/systemd/system/rsyslog.service
|
| 55 | 55 |
install -p -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
|
| 56 | 56 |
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
|
| 57 | 57 |
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rsyslog.conf
|
| 58 |
+install -vdm 644 %{buildroot}%{_sysconfdir}/rsyslog.d
|
|
| 58 | 59 |
find %{buildroot} -name '*.la' -delete
|
| 59 | 60 |
|
| 60 | 61 |
%check |
| ... | ... |
@@ -80,7 +81,10 @@ make %{?_smp_mflags} check
|
| 80 | 80 |
%{_libdir}/systemd/system/rsyslog.service
|
| 81 | 81 |
%{_sysconfdir}/systemd/journald.conf.d/*
|
| 82 | 82 |
%{_sysconfdir}/rsyslog.conf
|
| 83 |
+%{_sysconfdir}/rsyslog.d
|
|
| 83 | 84 |
%changelog |
| 85 |
+* Tue Apr 24 2018 Xiaolin Li <xiaolinl@vmware.com> 8.26.0-6 |
|
| 86 |
+- Include /etc/rsyslog.d/ in rpm. |
|
| 84 | 87 |
* Thu Apr 12 2018 Xiaolin Li <xiaolinl@vmware.com> 8.26.0-5 |
| 85 | 88 |
- Add $IncludeConfig /etc/rsyslog.d/ to rsyslog.conf |
| 86 | 89 |
* Fri Dec 15 2017 Anish Swaminathan <anishs@vmware.com> 8.26.0-4 |