SHA256
1
0
forked from pool/systemd

- Remove rsyslog listen.conf, handled directly by rsyslog now

(bnc#747871).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=252
This commit is contained in:
Frederic Crozat 2012-02-21 09:10:49 +00:00 committed by Git OBS Bridge
parent f5d0d5b705
commit 72c1e3fb62
4 changed files with 12 additions and 9 deletions

View File

@ -1 +0,0 @@
$SystemLogSocketName /run/systemd/journal/syslog

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
- Remove rsyslog listen.conf, handled directly by rsyslog now
(bnc#747871).
-------------------------------------------------------------------
Mon Feb 20 13:33:45 UTC 2012 - fcrozat@suse.com

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com
- Remove rsyslog listen.conf, handled directly by rsyslog now
(bnc#747871).
-------------------------------------------------------------------
Mon Feb 20 13:33:45 UTC 2012 - fcrozat@suse.com

View File

@ -63,8 +63,6 @@ Source3: systemd-sysv-convert
Source4: macros.systemd
Source5: systemd-insserv_conf
Source6: baselibs.conf
# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
Source11: listen.conf
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
# handle SUSE specific kbd settings
Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch
@ -223,10 +221,6 @@ rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/coredump.conf
# Let rsyslog read from /proc/kmsg for now
sed -i -e 's/\#ImportKernel=yes/ImportKernel=no/' %{buildroot}%{_sysconfdir}/systemd/systemd-journald.conf
# Install rsyslog fragment
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/rsyslog.d/
# Create the /var/log/journal directory to change the volatile journal to a persistent one
mkdir -p %{buildroot}/var/log/journal
@ -318,7 +312,6 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/binfmt.d
%dir /usr/lib/sysctl.d
%dir %{_sysconfdir}/sysctl.d
%dir %{_sysconfdir}/rsyslog.d
/usr/lib/tmpfiles.d/*.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/systemd-logind.conf
@ -330,7 +323,6 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml