Hello community, here is the log from the commit of package avahi for openSUSE:Factory checked in at 2014-03-21 12:14:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avahi (Old) and /work/SRC/openSUSE:Factory/.avahi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi" Changes: -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2013-09-26 19:28:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avahi.new/avahi.changes 2014-03-21 12:14:45.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 27 18:12:43 UTC 2014 - m...@suse.com + +- Do not start unconditionally / by default under sysconfig as + it breaks vlan,bridge,bonding setups (bnc#853845, bnc#851953). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.GtuAHq/_old 2014-03-21 12:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.GtuAHq/_new 2014-03-21 12:14:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 avahi-mono.spec: same change avahi-qt4.spec: same change ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.GtuAHq/_old 2014-03-21 12:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.GtuAHq/_new 2014-03-21 12:14:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -979,6 +979,17 @@ %if %suse_version >= 1210 %service_add_pre avahi-dnsconfd.service avahi-daemon.service %endif +# bnc#853845,bnc#851953: do not start by default under +# sysconfig as this breaks vlan,bridge,bonding setups +# in pre to revert old default setting from template. +if test -f var/adm/fillup-templates/sysconfig.avahi-autoipd -a \ + -f etc/sysconfig/avahi ; then + . var/adm/fillup-templates/sysconfig.avahi-autoipd + if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then + sed -i etc/sysconfig/avahi \ + -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/' + fi +fi %post %{fillup_only -n avahi} ++++++ avahi-autoipd.README.SUSE ++++++ --- /var/tmp/diff_new_pack.GtuAHq/_old 2014-03-21 12:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.GtuAHq/_new 2014-03-21 12:14:46.000000000 +0100 @@ -63,7 +63,10 @@ autoip from sysconfig package ============================= -autoip is hard bound to sysconfig scripts and it is called during ifup. +autoip is not bound to sysconfig scripts and it is not called during +as sysconfig is using an own implementation. To enable you have to +set AVAHI_AUTOIPD_ENABLE=yes in /etc/sysconfig/avahi. Note, that it +starts unconditionally then and breaks bridges,vlan,bond, ... If DHCP adrress is assigned, autoip ends immediately. Only if no DHCP address is assigned, it stays running as a daemon and provides IPv4LL ++++++ avahi-autoipd.sysconfig ++++++ --- /var/tmp/diff_new_pack.GtuAHq/_old 2014-03-21 12:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.GtuAHq/_new 2014-03-21 12:14:46.000000000 +0100 @@ -2,15 +2,18 @@ ## Description: Zeroconf (Bonjour, Rendezvous) options ## Type: yesno -## Default: yes +## Default: no # # Enable or disable avahi implementation of IPv4LL. If you select # "yes", then it ignores AUTOIP keyword in the YaST network # configuration. You should disable autoip implementation by disabling # AUTOIP in the YaST network configuration of all devices. +# +# Note, that enabling it causes to start unconditionally on any +# interface and will break bridges,vlan,bond, ... # For more see @docdir@/avahi-autoipd/README.SUSE. # -AVAHI_AUTOIPD_ENABLE="yes" +AVAHI_AUTOIPD_ENABLE="no" ## Type: yesno ## Default: no -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org