Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2014-01-15 19:40:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2013-12-07 08:52:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2014-01-15 22:59:04.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Jan 13 16:36:06 UTC 2014 - [email protected] + +- Use an unconditional rcnetwork symlink to /sbin/service + +------------------------------------------------------------------- +Thu Jan 9 13:06:12 UTC 2014 - [email protected] + +- version 0.83.0 +- Recommend wicked-service instead of sysconfig-network as the + default network service and drop sysconfig-network. The wicked + service package provides systemd service files requesting the + network.service alias at service enable time as well as the + ifup compatibility scripts using wicked as network backend + (fate#316768,bnc#856591). +- ifcfg-bonding.5: fixed to use startmode hotplug in slave example +- Use ZEROCONF_ROUTE=no as new default (fate#314482) + The NOZEROCONF="yes" variable were double-negated in it's meaning + and did not reflect what the variable really does (fate#314482). + +------------------------------------------------------------------- +Wed Jan 8 14:45:41 UTC 2014 - [email protected] + +- rcnetwork: use service type oneshot, not forking + Sometimes, network fails to start / stops itself, because the per + interface services started inside it, need already started network + and fail as network did not yet reached started state. This does + not happen with oneshot network service type (bnc#853908). + +------------------------------------------------------------------- Old: ---- sysconfig-0.82.1.tar.bz2 New: ---- sysconfig-0.83.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.oAzXpH/_old 2014-01-15 22:59:05.000000000 +0100 +++ /var/tmp/diff_new_pack.oAzXpH/_new 2014-01-15 22:59:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# 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 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.82.1 +Version: 0.83.0 Release: 0 Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ @@ -36,7 +36,7 @@ Requires: /sbin/ifup Requires: /sbin/netconfig Requires: sysvinit(network) -Recommends: sysconfig-network = %{version} +Recommends: wicked-service %description This package provides the SuSE system configuration scheme for the @@ -72,37 +72,6 @@ Milisav Radmanic <[email protected]> -%package network -Summary: Traditional network scripts -Group: System/Base -Requires(pre): sysconfig = %{version} -Requires: /sbin/netconfig -Requires: bridge-utils -Requires: iproute2 -Requires: procps -Requires: tunctl -Requires: vlan -Provides: /sbin/ifup -Conflicts: otherproviders(/sbin/ifup) - -%description network -This package provides the traditional "ifup" alias "netcontrol" -network scripts. - -Authors: --------- - Olaf Kirch <[email protected]> - Bjoern Jacke <[email protected]> - Mads Martin Joergensen <[email protected]> - Peter Poeml <[email protected]> - Arvin Schnell <[email protected]> - Michal Svec <[email protected]> - Christian Zoz <[email protected]> - Werner Fink <[email protected]> - Hannes Reinecke <[email protected]> - Marius Tomaschewski <[email protected]> - - %prep %setup -n sysconfig-%{version} @@ -129,8 +98,8 @@ make DESTDIR=$RPM_BUILD_ROOT install touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp -# remove template dir -rm -rf $RPM_BUILD_ROOT/etc/sysconfig/network/ifservices.template/ +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcnetwork %files %defattr(-,root,root) @@ -139,46 +108,15 @@ %config /etc/sysconfig/network/ifcfg.template %ghost /etc/sysconfig/network/config %ghost /etc/sysconfig/network/dhcp -%config(noreplace) %attr(600,root,root) /etc/sysconfig/network/ifcfg-lo -%config(noreplace) /etc/sysconfig/network/ifroute-lo %dir /usr/share/doc/packages/sysconfig %doc /usr/share/doc/packages/sysconfig/Contents %doc /usr/share/doc/packages/sysconfig/COPYING - -%files network -%defattr(-,root,root) -%config(noreplace) /etc/ppp/ip-up -%config(noreplace) /etc/ppp/ip-down -%config(noreplace) /etc/ppp/ipv6-up -%config(noreplace) /etc/ppp/ipv6-down -/etc/ppp/poll.tcpip -%udevdir/rules.d/77-network.rules -/etc/sysconfig/network/scripts/functions -/etc/sysconfig/network/scripts/functions.common /etc/sysconfig/network/scripts/functions.rpm-utils -/etc/sysconfig/network/scripts/extradebug -/etc/sysconfig/network/scripts/if* -/etc/sysconfig/network/scripts/convert* -/etc/sysconfig/network/scripts/move_shm_sysconfig.sh -/etc/sysconfig/network/scripts/create-ifservices-directory -/etc/sysconfig/network/scripts/dhcpcd-hook -/etc/sysconfig/network/scripts/link_wait -/etc/sysconfig/network/if-up.d/ndp-proxy -/etc/sysconfig/network/if-down.d/ndp-proxy -/usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network -%dir /usr/share/doc/packages/sysconfig -%doc /usr/share/doc/packages/sysconfig/Network -%doc /usr/share/doc/packages/sysconfig/README* -%_mandir/*/if* -%_mandir/*/routes* -%_unitdir/[email protected] -%_unitdir/network.service -/etc/init.d/network -/sbin/if* -/sbin/autoip -/sbin/rcnetwork +/usr/share/omc/svcinfo.d/network.xml +%{_sbindir}/rcnetwork +/sbin/ifuser %files netconfig %defattr(-,root,root) @@ -189,13 +127,9 @@ /usr/share/man/man8/netconfig.8.gz %doc /usr/share/doc/packages/sysconfig/netconfig.png -%pre network +%pre # package update ? if [ ${1:-0} -gt 1 ]; then - # update to >= 0.72.1 (-> openSUSE 11.2) - if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then - touch etc/sysconfig/network/__move_shm_sysconfig__ - fi # trigger update from < 0.80.x only (-> openSUSE 12.3), # (guard for variable added to network/config later...) if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ @@ -208,40 +142,31 @@ fi fi -%post network -# * update to >= 0.72.1: before anything else, move state -# files from dev/shm/sysconfig to dev/.sysconfig/network -if [ -f etc/sysconfig/network/__move_shm_sysconfig__ ] ; then - etc/sysconfig/network/scripts/move_shm_sysconfig.sh . - rm -f etc/sysconfig/network/__move_shm_sysconfig__ -fi +%post # ## we provide own, improved variant of the remove_and_set suse ## rpm macro that is able to handle files in subdirs, and more . etc/sysconfig/network/scripts/functions.rpm-utils # -# new NOZEROCONF=yes default, https://fate.suse.com/314482 +# remove obsolete sysconfig-network specific variables sysconfig_remove_and_set network/config NOZEROCONF sysconfig_remove_and_set network/config LINKLOCAL_INTERFACES +sysconfig_remove_and_set network/config IFPLUGD_OPTIONS +sysconfig_remove_and_set network/config DEFAULT_BROADCAST +sysconfig_remove_and_set network/config FORCE_PERSISTENT_NAMES +sysconfig_remove_and_set network/config MANDATORY_DEVICES +sysconfig_remove_and_set network/dhcp DHCLIENT_BIN +sysconfig_remove_and_set network/dhcp DHCLIENT6_BIN +sysconfig_remove_and_set network/dhcp DHCLIENT_WAIT_LINK +sysconfig_remove_and_set network/dhcp DHCLIENT_USER_OPTIONS +sysconfig_remove_and_set network/dhcp DHCLIENT6_USER_OPTIONS +sysconfig_remove_and_set network/dhcp DHCPCD_USER_OPTIONS +sysconfig_remove_and_set network/dhcp DHCP6C_USER_OPTIONS ## -%{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} /sbin/ldconfig -echo "Removing old autogenerated device configuration files:" -# -# * update to >= 11.1 / SLE11: -# -# convert dns / modify_resolvconf to netconfig -if [ -e etc/sysconfig/network/scripts/convert_to_netconfig_dns ] ; then - ROOT=$PWD bash etc/sysconfig/network/scripts/convert_to_netconfig_dns -fi -# convert nis / dhclient variables to netconfig -if [ -e etc/sysconfig/network/scripts/convert_to_netconfig_nis ] ; then - ROOT=$PWD bash etc/sysconfig/network/scripts/convert_to_netconfig_nis -fi -# remove ntp variables obsoleted by netconfig (new default is "yes") -# as well as some another obsolete dhcp variables +# remove obsolete dhcp and per interface variables _umask=`umask` for file in etc/sysconfig/network/dhcp etc/sysconfig/network/ifcfg-* ; do name="${file##*\/ifcfg-}" @@ -258,10 +183,9 @@ umask $_umask done # be a little bit paranoid and set the correct mode even we set umask -chmod 0600 etc/sysconfig/network/ifcfg-* +chmod 0600 etc/sysconfig/network/ifcfg-* 2>/dev/null || : # bnc#803058: migrate from NETWORKMANAGER=yes/no variable to # network.service alias link masking rcnetwork. -enable=yes if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then . /dev/.sysconfig/network/migrate_nm_variable case $NETWORKMANAGER in @@ -277,30 +201,19 @@ # as hint for migration in NetworkManager post-install ... # Mask /etc/init.d/network service until NM update is done. /usr/bin/systemctl --force mask network.service || : - enable=no ;; esac else # cleanup obsolete NETWORKMANAGER variable sysconfig_remove_and_set network/config NETWORKMANAGER fi -if test "$enable" = "yes" -a -x /usr/bin/systemctl ; then - _id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || : - case "${_id#Id=}" in - ""|network.service) - /usr/bin/systemctl --system daemon-reload || : - /usr/bin/systemctl --force enable network.service || : - ;; - esac -fi -%postun network -%{insserv_cleanup} +%postun /sbin/ldconfig -%preun network +%preun if test "$1" = "0" -a -x /etc/init.d/network ; then - /etc/init.d/network stop-all-dhcp-clients || : + /etc/init.d/network stop-all-dhcp-clients 2>/dev/null || : fi %changelog ++++++ sysconfig-0.82.1.tar.bz2 -> sysconfig-0.83.0.tar.bz2 ++++++ ++++ 17334 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
