Hello community, here is the log from the commit of package radvd for openSUSE:Factory checked in at 2013-11-12 20:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/radvd (Old) and /work/SRC/openSUSE:Factory/.radvd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "radvd" Changes: -------- --- /work/SRC/openSUSE:Factory/radvd/radvd.changes 2012-12-08 15:53:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.radvd.new/radvd.changes 2013-11-12 20:14:04.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 5 12:44:38 UTC 2013 - speili...@suse.com + +- Don't start daemon after package installation, the default config is almost + useless and previous package versions installed even bad ones into + /etc/radvd.conf (it would never be fixed since the file is + %ghost %config(noreplace) +- Fix try-restart to only restart the daemon if it's actually running. Allow + condrestart, which is LSB + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ radvd.spec ++++++ --- /var/tmp/diff_new_pack.Cwry47/_old 2013-11-12 20:14:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Cwry47/_new 2013-11-12 20:14:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package radvd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -88,7 +88,7 @@ %post # zap old (<= 11.4) default test -f /etc/sysconfig/radvd && sed -ie '/^RADVD_OPTIONS/s/-u daemon//' /etc/sysconfig/radvd -%{fillup_and_insserv radvd} +%{fillup_only radvd} # if [ ! -e /etc/radvd.conf ]; then # yeah, not quite the rfc4193 algorithm but hopefully @@ -136,9 +136,6 @@ %service_del_preun %{name}.service %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %ghost %dir %attr(0755,radvd,root) %{_localstatedir}/run/radvd/ ++++++ radvd.init ++++++ --- /var/tmp/diff_new_pack.Cwry47/_old 2013-11-12 20:14:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Cwry47/_new 2013-11-12 20:14:05.000000000 +0100 @@ -49,10 +49,6 @@ killproc -p $DAEMON_PIDFILE -TERM $DAEMON_BIN rc_status -v ;; - try-restart) - $0 stop && $0 start - rc_status - ;; restart) $0 stop $0 start @@ -76,6 +72,18 @@ probe) test "$DAEMON_CONF" -nt "$DAEMON_PIDFILE" && echo reload ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + rc_status # Remember status and be quiet + ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org