Accepting request 147807 from home:mtomaschewski:branches:Base:System

- Enable rsyslog.service and create the syslog.service alias link
  in post install -- regardless of a preset config (bnc#790805).
- Check the existence of /etc/init.d/syslog script before calling
  the restart_on_update and stop_on_removal macros to avoid errors
  on update. Since openSUSE 12.3, no syslog init script is shipped
  (bnc#90298,bnc#750478).

OBS-URL: https://build.opensuse.org/request/show/147807
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=122

rsyslog.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan  9 14:05:53 UTC 2013 - mt@suse.com
+
+- Enable rsyslog.service and create the syslog.service alias link
+  in post install -- regardless of a preset config (bnc#790805).
+- Check the existence of /etc/init.d/syslog script before calling
+  the restart_on_update and stop_on_removal macros to avoid errors
+  on update. Since openSUSE 12.3, no syslog init script is shipped
+  (bnc#90298,bnc#750478).
+
 -------------------------------------------------------------------
 Mon Jan  7 10:58:19 UTC 2013 - mt@suse.com
 

rsyslog.spec

@@ -682,7 +682,13 @@ chmod 640 ".%{rsyslog_sockets_cfg}"
 # Enable the rsyslogservice to be started by systemd
 #
 %if %{with systemd} && ! %{with systemv}
+# This macro enables based on a systemctl preset config file only
 %{service_add_post rsyslog.service}
+# But we want to enable a syslog-daemon regardless of the preset;
+# force the creation of a syslog.service alias link (bnc#790805).
+# We do not check the obsolete SYSLOG_DAEMON variable as we want
+# to switch when installing it and there is a provider conflict.
+/usr/bin/systemctl -f enable rsyslog.service >/dev/null 2>&1 || :
 %endif
 
 %preun
@@ -692,7 +698,9 @@ chmod 640 ".%{rsyslog_sockets_cfg}"
 %if %{with systemd} && ! %{with systemv}
 %{service_del_preun rsyslog.service}
 %else
-%{stop_on_removal syslog}
+if test -x /etc/init.d/syslog ; then
+	%{stop_on_removal syslog}
+fi
 #
 # reset SYSLOG_DAEMON variable on removal
 #
@@ -717,7 +725,9 @@ fi
 #
 # stop the rsyslogd daemon when it is running
 #
-%{restart_on_update syslog}
+if test -x /etc/init.d/syslog ; then
+	%{restart_on_update syslog}
+fi
 #
 # cleanup init scripts
 #