From 3caaf5b2f902b5720cdbb14a825f5871691f48b9313f47f647a7260268123ad2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 19 Mar 2014 12:45:22 +0000 Subject: [PATCH] Accepting request 226731 from home:mtomaschewski:branches:GNOME:Factory Same to rq#224144, released in openSUSE:13.1:Update: - do not start unconditionally / by default under sysconfig as it breaks vlan,bridge,bonding setups (bnc#853845,bnc#851953) OBS-URL: https://build.opensuse.org/request/show/226731 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=106 --- avahi-autoipd.README.SUSE | 5 ++++- avahi-autoipd.sysconfig | 7 +++++-- avahi-glib2.spec | 2 +- avahi-mono.spec | 2 +- avahi-qt4.spec | 2 +- avahi.changes | 6 ++++++ avahi.spec | 13 ++++++++++++- 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/avahi-autoipd.README.SUSE b/avahi-autoipd.README.SUSE index 408d8a1..c1409d2 100644 --- a/avahi-autoipd.README.SUSE +++ b/avahi-autoipd.README.SUSE @@ -63,7 +63,10 @@ Disadvantage: 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 diff --git a/avahi-autoipd.sysconfig b/avahi-autoipd.sysconfig index 1f65eb7..38e6422 100644 --- a/avahi-autoipd.sysconfig +++ b/avahi-autoipd.sysconfig @@ -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 diff --git a/avahi-glib2.spec b/avahi-glib2.spec index fbdbd66..24bdcdc 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -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 diff --git a/avahi-mono.spec b/avahi-mono.spec index 61e8307..778747b 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# 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 diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 58d6b77..cc1b219 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# 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 diff --git a/avahi.changes b/avahi.changes index 1b28aae..bded39f 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 27 18:12:43 UTC 2014 - mt@suse.com + +- do not start unconditionally / by default under sysconfig as + it breaks vlan,bridge,bonding setups (bnc#853845,bnc#851953) + ------------------------------------------------------------------- Wed Sep 25 17:26:26 UTC 2013 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 2339738..366a864 100644 --- a/avahi.spec +++ b/avahi.spec @@ -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 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc %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}