Hello community,
here is the log from the commit of package syslogd for openSUSE:Factory
checked in at Tue Sep 20 12:59:13 CEST 2011.
--------
--- syslogd/syslogd.changes 2011-09-02 10:24:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2011-09-20
10:42:42.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 20 08:38:55 UTC 2011 - wer...@suse.de
+
+- Add syslink to /dev/null for earlysyslog service unit to avoid
+ to start it twice with systemd
+- Do not disable SysV service links with systemd
+- For syslog service unit add conflicts witjh syslog-ng and rsyslog
+ service units
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslogd.spec ++++++
--- /var/tmp/diff_new_pack.V8oBvt/_old 2011-09-20 12:59:07.000000000 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new 2011-09-20 12:59:07.000000000 +0200
@@ -195,6 +195,7 @@
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+ ln -sf /dev/null $RPM_BUILD_ROOT%{sysdsysunitdir}/earlysyslog.service
%ifarch s390 s390x
sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -304,6 +305,7 @@
%config(noreplace) /etc/logrotate.d/syslog
%config /etc/init.d/syslog
%config /etc/init.d/earlysyslog
+%config %{sysdsysunitdir}/earlysyslog.service
%config %{sysdsysunitdir}/syslog.service
%config %{sysdsysunitdir}/klog.service
%doc %{_mandir}/man8/syslog.8.gz
++++++ syslog-service-generator ++++++
--- /var/tmp/diff_new_pack.V8oBvt/_old 2011-09-20 12:59:07.000000000 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new 2011-09-20 12:59:07.000000000 +0200
@@ -321,12 +321,4 @@
fi
#
-# Last but not least remove the old (early) service links from SystemV init
-#
-for service in /etc/init.d/*.d/*syslog ; do
- test -h $service || continue
- /bin/rm -f $service
-done
-
-#
# end of /lib/systemd/system-generator/syslog-service-generator
++++++ syslog.service ++++++
--- /var/tmp/diff_new_pack.V8oBvt/_old 2011-09-20 12:59:07.000000000 +0200
+++ /var/tmp/diff_new_pack.V8oBvt/_new 2011-09-20 12:59:07.000000000 +0200
@@ -18,7 +18,7 @@
After=var-run.mount
Before=syslog.target
OnFailure=systemd-kmsg-syslogd.service
-Names=earlysyslog.service
+Conflicts=syslog-ng.service rsyslog.service
#
# Now systemd include the further dependency rules and
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
