Hello community, here is the log from the commit of package sysconfig.1220 for openSUSE:12.2:Update checked in at 2013-01-21 12:23:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/sysconfig.1220 (Old) and /work/SRC/openSUSE:12.2:Update/.sysconfig.1220.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig.1220", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:12.2:Update/.sysconfig.1220.new/sysconfig.changes 2013-01-21 12:23:39.000000000 +0100 @@ -0,0 +1,4869 @@ +------------------------------------------------------------------- +Tue Jan 8 17:10:23 UTC 2013 - m...@suse.de + +- Fixed to correctly apply STP constrains also to float time + values with a 1/100 sec precision (bnc#753387,bnc#794720). + [0011-ifup-bridge-handle-1-100-sec-precision-stp-times.patch] +- Updated bridge documentation link in ifcfg-bridge.5 (bnc#791553). + [0012-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch] + +------------------------------------------------------------------- +Fri Nov 23 09:42:01 UTC 2012 - m...@suse.de + +- Execute netconfig/ntp-runtime update in background, so dhcp post + processing works faster when ntpdc needs a while (bnc#780644). + [0010-Execute-netconfig-ntp-runtime-update-in-background.patch] + +------------------------------------------------------------------- +Tue Nov 13 14:15:47 UTC 2012 - m...@suse.de + +- Changed rcnetwork to not report dhcp in background to systemd + (bnc#785240,bnc#780644). You may set DHCLIENT_MODIFY_SMB_CONF + to "no" in /etc/sysconfig/network/dhcp as the samba/cifs hooks + make systemctl calls to reload/restart nmb and other services + which block (systemd deadlock) ifup scripts for a long time. + [0009-rcnetwork-no-dhcp-in-background-report-to-systemd.patch] + +------------------------------------------------------------------- +Thu Oct 25 16:26:09 UTC 2012 - m...@suse.de + +- Fixed to not report failure while setting unsupported power + management option in ifup-wireless as the support and features + depends on the driver (bnc#716652). + [0008-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch] +- Fixed to check and reject too long interface names or names + with suspect characters, do not wait when creation of virtual + interface name fails (bnc#784952). + [0005-ifup-fail-early-for-too-long-interface-names.patch, + 0006-network-do-not-wait-for-virtuals-reporting-errors.patch, + 0007-ifup-check-for-valid-characters-in-interface-names.patch] + +------------------------------------------------------------------- +Wed Sep 26 17:06:28 UTC 2012 - m...@suse.com + +- Fixed netconfig/ntp-runtime to not use try-restart as its start + may block for a while, so just add servers ourself. When ntpd is + not running (not yet started), the init script will pickup our + servers later (bnc#780644). + [0004-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch] +- Fixed ifup-dhcp to not start dhcp clients too early or they may + be unable to send packets and just increase resend time. Instead, + load af_packet module early and wait for link ready (bnc#780644). + [0001-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch, + 0002-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch, + 0003-modprobe-af_packet-early-before-link-set-up.patch] + +------------------------------------------------------------------- +Thu Aug 9 16:42:02 UTC 2012 - m...@suse.com + +- version 0.76.4 +- Check before running a script in netcontrol_services (bnc#775281). + +------------------------------------------------------------------- +Fri Jul 20 14:38:16 UTC 2012 - m...@suse.com + +- Applied patch blacklisting uas driver confirmed by Intel as + a hopeless case (bnc#770301). + +------------------------------------------------------------------- +Thu Jul 19 13:58:01 UTC 2012 - m...@suse.com + +- /etc/init.d/network: do not check the renamed-flag when udev + daemon is not running as in LXC containers. It caused to wait + until the udev rename finished with a not started network and + failure result (bnc#771615). + +------------------------------------------------------------------- +Mon Jun 11 10:10:10 UTC 2012 - m...@suse.com + +- version 0.76.3 +- Fixed ifrenew-dhcp to use built-in dhcpcd --renew (bnc#763533). +- Moved the X-Systemd-RemainAfterExit LSB tag before Description + in /etc/init.d/network scripts as workaround for the case that + a not yet fixed systemd is in use (bnc#763533). +- Fixed to differentiate ib/ibchild/bond types and stop ib-bond + interfaces correctly. + +------------------------------------------------------------------- +Tue Apr 10 11:22:02 UTC 2012 - m...@suse.com + +- version 0.76.2 +- ifup-bridge: apply stp contstrains when STP is on (bnc#753387) +- ifup-route: fixed use of -4/6 option for ip route (bnc#745252) + and do not require dummy gateway for ipv4 multicast routes. +- Added tests to the 77-network.rules rule file if the /sbin/ifup + and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775), + disabled ipw3945d.sh script run and updated 81-mount.rules file + to work with more actual udev versions. Thanks to Robert Milasan, + who proposed these changes. + +------------------------------------------------------------------- +Mon Feb 27 10:46:45 UTC 2012 - wer...@suse.de + +- In poll.tcpip avoid warnings messages of fetchmail by using the + owner ship of the system wide configuration file /etc/fechmailrc + which should be owned by the user and group mail. + +------------------------------------------------------------------- +Wed Feb 15 19:35:41 UTC 2012 - m...@suse.de + +- version 0.76.1 +- Updated GPL in doc/COPYING, address statements, spec tags. +- Disabled obsolete network-remotefs as /usr is mounted in initrd + when needed and we don't need to handle it any more (equivalent + with a remote /-fs now). More cleanup follows. +- Always enable boot-wait mode under systemd +- Improved extradebug to include all args and to log pid. +- Filter out labeled ipv4 addresses in get_ipv4address used + to fetch the 1st address from the TUNNEL_DEVICE interface. + Allows to configure a label for each address that should + be skipped. Updated ifcfg-tunnel.5 man page. (bnc#741453) + Thanks to Jon Nelson for his report with a fix proposal! +- Explicitly disabled posix mode in all bash scripts as we are + using several features not supported in posix mode (bnc#739338). +- Fixed ipv6 dad / link ready wait time calculation (1/10 of the + specified time) and replaced useless up flag check loop with + link_ready_wait to avoid send errors from dhclient6 (bnc#697929). +- Added to require vlan, bridge-utils and tunctl packages via spec, + that are often required in base networking configurations and + are missed otherwise in 2nd installation stage, that may be + unable to install them for some reason (bnc#733118). + +------------------------------------------------------------------- +Wed Jan 4 14:20:53 UTC 2012 - m...@suse.com + +- Fixed incorrect exists_iface_config test in ifprobe + (bnc#728611#c19) + +------------------------------------------------------------------- +Mon Dec 19 09:41:09 UTC 2011 - m...@suse.com + +- Fixed to quote config / interface variables in ifservices script + and cleaned up content of the ESSID which gets appended to them + by NetworkManager dispatcher hook (bnc#735394, CVE-2011-4182). + Fixed also to return proper exit code 0 in NM dispatcher hooks. + +------------------------------------------------------------------- +Mon Dec 5 16:41:06 UTC 2011 - m...@suse.com + +- version 0.76.0 +- Do not suggest dhcp6c client from dropped dhcpv6 package + in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp + and changed to use dhclient6 as first choice (bnc#734723). +- Added X-Systemd-RemainAfterExit: true LSB header (bnc#727771) +- Fixed iBFT support to not use any ifcfg files, added workaround + for virtio iBFT references (additional path component), try to + request the iBFT IP-Address in DHCP mode and apply the iBFT DNS + name servers (when any) via netconfig (bnc#723796). +- Changed to call ip addr flush in ifdown, but after ip link set + down as it does not cause ipv6 sysctl tree side effects then + at least with more recent kernels (bnc#580018,bnc#559170). + +------------------------------------------------------------------- +Sun Nov 27 06:57:47 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------ +Fri Oct 21 11:35:06 UTC 2011 - m...@suse.com + +- Changed NM_ONLINE_TIMEOUT default back to 0 to avoid + unneeded waiting for NM interfaces at boot (bnc#722304) + +------------------------------------------------------------------ +Wed Oct 5 08:12:14 UTC 2011 - m...@suse.com + +- version 0.75.4 +- Don't fail when wireless power setting isn't supported + Thanks to Manuel Stol for the patch (bnc#716652). +- Cleanup link / dad wait verify flag after status update + +------------------------------------------------------------------ +Mon Sep 26 12:36:27 UTC 2011 - m...@suse.com + +- Fixed inverted link ready return value test + +------------------------------------------------------------------ +Mon Sep 26 10:09:23 UTC 2011 - m...@suse.com + +- version 0.75.3 +- Handle changing between ifup and NM with systemd and fixed + to enable boot flags in /etc/init.d/network while booting + under systemd (bnc#719214). +- Wait/check until the end of ipv6 duplicate address detection + to not cause failures of following services (bnc#697929). + +------------------------------------------------------------------ +Thu Sep 8 13:56:50 UTC 2011 - m...@suse.com ++++ 4672 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.sysconfig.1220.new/sysconfig.changes New: ---- 0001-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch 0002-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch 0003-modprobe-af_packet-early-before-link-set-up.patch 0004-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch 0005-ifup-fail-early-for-too-long-interface-names.patch 0006-network-do-not-wait-for-virtuals-reporting-errors.patch 0007-ifup-check-for-valid-characters-in-interface-names.patch 0008-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch 0009-rcnetwork-no-dhcp-in-background-report-to-systemd.patch 0010-Execute-netconfig-ntp-runtime-update-in-background.patch 0011-ifup-bridge-handle-1-100-sec-precision-stp-times.patch 0012-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch sysconfig-0.76.4.tar.bz2 sysconfig.changes sysconfig.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ # # spec file for package sysconfig # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: sysconfig Version: 0.76.4 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ Group: System/Base Url: http://gitorious.org/opensuse/sysconfig PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep # we may create these automatically from rpm later Provides: sysvinit(network) Requires: bridge-utils Requires: dbus-1 Requires: iproute2 Requires: procps Requires: tunctl Requires: vlan BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 Patch1: 0001-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch Patch2: 0002-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch Patch3: 0003-modprobe-af_packet-early-before-link-set-up.patch Patch4: 0004-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch Patch5: 0005-ifup-fail-early-for-too-long-interface-names.patch Patch6: 0006-network-do-not-wait-for-virtuals-reporting-errors.patch Patch7: 0007-ifup-check-for-valid-characters-in-interface-names.patch Patch8: 0008-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch Patch9: 0009-rcnetwork-no-dhcp-in-background-report-to-systemd.patch Patch10: 0010-Execute-netconfig-ntp-runtime-update-in-background.patch Patch11: 0011-ifup-bridge-handle-1-100-sec-precision-stp-times.patch Patch12: 0012-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch %description This package provides the SuSE system configuration scheme and the traditional "ifup" alias "netcontrol" network scripts. Authors: -------- Olaf Kirch <o...@suse.de> Bjoern Jacke <bjo...@j3e.de> Mads Martin Joergensen <m...@suse.de> Peter Poeml <po...@suse.de> Arvin Schnell <ar...@suse.de> Michal Svec <ms...@suse.cz> Christian Zoz <z...@suse.de> Werner Fink <wer...@suse.de> Marius Tomaschewski <m...@suse.de> %prep %setup -n sysconfig-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %build autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS -fPIC" \ ./configure --prefix=/ \ --sbindir=/sbin \ --libdir=/%_lib \ --libdir=/usr/%_lib \ --sysconfdir=%_sysconfdir \ --mandir=%_mandir \ --with-fillup-templatesdir=/var/adm/fillup-templates %{__make} %{?_smp_mflags} %check make check %clean rm -rf $RPM_BUILD_ROOT %install make DESTDIR=$RPM_BUILD_ROOT install touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp # install udevmountd mkdir -p $RPM_BUILD_ROOT/lib/udev mv $RPM_BUILD_ROOT/sbin/udevmountd $RPM_BUILD_ROOT/lib/udev # remove template dir rm -rf $RPM_BUILD_ROOT/etc/sysconfig/network/ifservices.template/ %files %defattr(-,root,root) /etc/init.d/* %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 %config(noreplace) /etc/ppp/ip-up %config(noreplace) /etc/ppp/ip-down %config(noreplace) /etc/ppp/ipv6-up %config(noreplace) /etc/ppp/ipv6-down %dir /lib/udev /lib/udev/udevmountd %dir /lib/udev/rules.d /lib/udev/rules.d/77-network.rules /lib/udev/rules.d/81-mount.rules %dir /etc/modprobe.d %config /etc/sysconfig/network/ifcfg.template %config /etc/modprobe.d/50-blacklist.conf /etc/sysconfig/network/scripts/* /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy /etc/netconfig.d /etc/ppp/poll.tcpip /etc/NetworkManager /sbin/* %doc /usr/share/doc/packages/sysconfig %_mandir/*/* /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-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 fi %post # * 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 # ## 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 # %{fillup_and_insserv -fY network} %{fillup_and_insserv -fY network-remotefs} %{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 _umask=`umask` for file in etc/sysconfig/network/dhcp etc/sysconfig/network/ifcfg-* ; do name="${file##*\/ifcfg-}" case $name in (lo|""|*" "*|*~|*.old|*.rpmnew|*.rpmsave|*.scpmbackup) continue ;; esac case $file in (*/ifcfg-*) umask 0177 ;; esac sysconfig_remove_and_set -b "" $file \ DHCLIENT_MODIFY_NTP_CONF \ DHCLIENT_ADDITIONAL_OPTIONS \ DHCLIENT_SCRIPT_EXE umask $_umask done # erroneous move from network/dhcp to network/config while 11.1 beta sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS # be a little bit paranoid and set the correct mode even we set umask chmod 0600 etc/sysconfig/network/ifcfg-* %postun %{insserv_cleanup} /sbin/ldconfig %preun %{stop_on_removal network} %changelog ++++++ 0001-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch ++++++ >From 80a5f487e79f6b2ea1aa5cf01018a1f948614433 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Wed, 26 Sep 2012 17:08:51 +0200 References: bnc#780644 Subject: [PATCH 1/4] Use dhclient -v when debug is enabled (bnc#780644) --- scripts/ifup-dhcp | 4 ++-- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index 3511920..33a7934 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -362,7 +362,7 @@ start_dhcp4_dhclient() { # don't write copyright info local args="-q" - test "$DHCLIENT_DEBUG" = "yes" && args="" + test "$DHCLIENT_DEBUG" = "yes" && args="-v" # send hostname for DDNS? case "$DHCLIENT_HOSTNAME_OPTION" in @@ -423,7 +423,7 @@ start_dhcp6_dhclient() { # don't write copyright info local args="-q" - test "$DHCLIENT6_DEBUG" = "yes" && args="" + test "$DHCLIENT6_DEBUG" = "yes" && args="-v" # send hostname for DDNS? case "$DHCLIENT6_HOSTNAME_OPTION" in -- 1.7.10.4 ++++++ 0002-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch ++++++ >From ff57324dc4ad2c80bf06a926861b7aa9864c5db5 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Wed, 26 Sep 2012 17:28:35 +0200 References: bnc#780644 Subject: [PATCH 2/4] Added DHCLIENT_WAIT_LINK variable instead to hardcode Changed to use DHCLIENT_WAIT_AT_BOOT/2 sec. --- config/sysconfig.dhcp-network | 21 ++++++++++++++++++--- scripts/ifup-dhcp | 4 +++- 2 Dateien geändert, 21 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/config/sysconfig.dhcp-network b/config/sysconfig.dhcp-network index 17c9688..2e63fbb 100644 --- a/config/sysconfig.dhcp-network +++ b/config/sysconfig.dhcp-network @@ -258,11 +258,24 @@ DHCLIENT_RELEASE_BEFORE_QUIT="no" # DHCLIENT6_RELEASE_BEFORE_QUIT="no" +## Type: integer +## Default: "" +# +# Before ifup-dhcp is going to start dhcp clients, it will set up the link +# when needed. Then it has to wait until the link is ready. This setting +# allows to specify the time how long to wait. Default is half of the time +# in the DHCLIENT_WAIT_AT_BOOT variable. +# +DHCLIENT_WAIT_LINK="" + ## Type: integer ## Default: 0 # -# Some interfaces need time to initialize. Add the latency time in seconds -# so these can be handled properly. Should probably set per interface rather than here. +# Some interfaces need time to initialize and/or do not report correct status. +# Add the latency time in seconds so these can be handled properly. Should +# probably set per interface rather than here. +# This setting causes a sleep time before dhcp clients are started regardless +# of the link status (wait time in DHCLIENT_WAIT_LINK). # DHCLIENT_SLEEP="0" @@ -271,7 +284,9 @@ DHCLIENT_SLEEP="0" # # When the DHCP client is started at boot time, the boot process will stop # until the interface is successfully configured, but at most for -# DHCLIENT_WAIT_AT_BOOT seconds. +# DHCLIENT_WAIT_AT_BOOT seconds. Do not set this variable higher than the +# WAIT_FOR_INTERFACES variable -- it is adjusted to WAIT_FOR_INTERFACES/2 +# as default. # # Note: RFC 2131 specifies, that the dhcp client should wait a random time # between one and ten seconds to desynchronize the use of DHCP at startup. diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index 33a7934..ad158e5 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -694,7 +694,9 @@ case "$ACTION" in ${LLADDR:+address $LLADDR} $LINK_OPTIONS # wait a bit or dhclient(6) may produce false send errors - link_ready_wait "$INTERFACE" 3 + # or dhcp4 may sent its first packets before link is ready, + # increase the resent time and all needs a while longer... + link_ready_wait "$INTERFACE" ${DHCLIENT_WAIT_LINK:-$((${DHCLIENT_WAIT_AT_BOOT:-15}/2))} # (optionally) wait until a device is really configured sleep ${DHCLIENT_SLEEP:-0} -- 1.7.10.4 ++++++ 0003-modprobe-af_packet-early-before-link-set-up.patch ++++++ >From 0d47eafa9b5e6743065157d3e4e9a91d6437209f Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Wed, 26 Sep 2012 17:34:40 +0200 References: bnc#780644 Subject: [PATCH 3/4] modprobe af_packet early, before link set up --- scripts/ifup-dhcp | 6 ++++++ 1 Datei geändert, 6 Zeilen hinzugefügt(+) diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp index ad158e5..d27ac35 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -687,6 +687,12 @@ case "$ACTION" in write_cached_config_data hostname "`hostname 2>/dev/null`" $INTERFACE commit_cached_config_data $INTERFACE + # make sure linux packet filter is ready before we set + # the interface up. Otherwise some dhcp packets may be + # never sent (or dhcp does not get any response?) until + # both the link + af_packet are ready to use. + /sbin/modprobe af_packet + debug "Activating interface $INTERFACE" if ! is_iface_up $INTERFACE ; then -- 1.7.10.4 ++++++ 0004-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch ++++++ >From 6172ff169d3b3b83a7d4b23ac7529dd4f57f88f2 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Wed, 26 Sep 2012 18:57:09 +0200 References: bnc#780644 Subject: [PATCH 4/4] netconfig/ntp-runtime: add servers, do not try-restart ntp try-restart picks up the servers we've written, but its start may block for a while, so just add servers ourself. When ntpd is not running (not yet started), the init script will pickup our servers later. --- scripts/netconfig.d/ntp-runtime | 23 +++++++++++++++++++---- 1 Datei geändert, 19 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/scripts/netconfig.d/ntp-runtime b/scripts/netconfig.d/ntp-runtime index ad3697c..8f83d8e 100755 --- a/scripts/netconfig.d/ntp-runtime +++ b/scripts/netconfig.d/ntp-runtime @@ -231,10 +231,25 @@ fi # here we should restart services if needed -# try restart ntp; reload is not supported and we need -# to delete old servers -if [ -x $r/etc/init.d/ntp ]; then - $r/etc/init.d/ntp try-restart >/dev/null 2>&1 +# +# do not restart or it may (will) block ifup +# just try to add the server at runtime ... +# +NTP_CONF="/etc/ntp.conf" +NTPDC_BIN="/usr/sbin/ntpdc" + +if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && /etc/init.d/ntp status >/dev/null 2>/dev/null ; then + NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF) + NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF) + NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && awk '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS) + + if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then + for server in ${NTP_SERVER_LIST[*]} ; do + NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n" + NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN) + debug "$PROGNAME add-server: $server" + done + fi fi exit 0; -- 1.7.10.4 ++++++ 0005-ifup-fail-early-for-too-long-interface-names.patch ++++++ >From 0ece7834f9e8c495c2238f8089aa942b1b633694 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Mon, 15 Oct 2012 12:25:06 +0200 References: bnc#784952 Subject: [PATCH 1/3] ifup: fail early for too long interface names --- scripts/ifup | 7 +++++++ 1 Datei geändert, 7 Zeilen hinzugefügt(+) diff --git a/scripts/ifup b/scripts/ifup index a73a86a..e56fba2 100755 --- a/scripts/ifup +++ b/scripts/ifup @@ -146,6 +146,13 @@ if [ -z "$CONFIG" ] ; then fi case $SCRIPTNAME in + ifup) + if [ ${#INTERFACE} -gt 15 ] ; then + message "`printf " %-9s: name too long" "$INTERFACE"`" + exit $R_ERROR + #exit $R_NOCONFIG + fi + ;; ifprobe) IFUPFILE=$RUN_FILES_BASE/ifup-$INTERFACE if [ ! -e "$IFUPFILE" ] ; then -- 1.7.10.4 ++++++ 0006-network-do-not-wait-for-virtuals-reporting-errors.patch ++++++ >From ab85d0fb76719f3d44cc36e74f5dafa7dc1aacba Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Mon, 15 Oct 2012 12:27:08 +0200 References: bnc#784952 Subject: [PATCH 2/3] network: do not wait for virtuals reporting errors --- scripts/network | 6 ++++++ 1 Datei geändert, 6 Zeilen hinzugefügt(+) diff --git a/scripts/network b/scripts/network index 3f4fe2c..3abdb5c 100755 --- a/scripts/network +++ b/scripts/network @@ -925,6 +925,7 @@ case "$ACTION" in done debug ... final + debug FAILED_IFACES='' debug SUCCESS_IFACES=$SUCCESS_IFACES debug MANDATORY_DEVICES=$MANDATORY_DEVICES debug FAILED=$FAILED @@ -950,6 +951,7 @@ case "$ACTION" in echo ;; $R_NOCONFIG) + FAILED_IFACES="$FAILED_IFACES $IFACE" rc_failed 6 rc_status -v1 # : $((FAILED++)) @@ -960,6 +962,7 @@ case "$ACTION" in rc_status -v1 ;; *) + FAILED_IFACES="$FAILED_IFACES $IFACE" rc_failed 7 rc_status -v1 # : $((FAILED++)) @@ -981,6 +984,9 @@ case "$ACTION" in for S in $SUCCESS_IFACES; do test "$IFACE" = "$S" && continue 2 done + for F in $FAILED_IFACES ; do + test "$IFACE" = "$F" && continue 2 + done IFACE="`type_filter $IFACE`" test -z "$IFACE" && continue status -m $IFACE &>/dev/null -- 1.7.10.4 ++++++ 0007-ifup-check-for-valid-characters-in-interface-names.patch ++++++ >From c10b01dc858da42ec9cec2674a9b57f53a1425b0 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Mon, 15 Oct 2012 14:12:38 +0200 References: bnc#784952 Subject: [PATCH 3/3] ifup: check for valid characters in interface names --- scripts/functions | 8 ++++++++ scripts/ifup | 18 ++++++++++-------- 2 Dateien geändert, 18 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) diff --git a/scripts/functions b/scripts/functions index 855055e..6469769 100644 --- a/scripts/functions +++ b/scripts/functions @@ -94,6 +94,14 @@ netcontrol_running() { test -f $NETWORK_RUNFILE } +is_valid_interface_name() +{ + local LANG=C LC_ALL=C + local INTERFACE="$1" + local IFNAME_RX='^[[:alnum:]._:-]{1,15}$' + [[ ${INTERFACE} =~ ${IFNAME_RX} ]] +} + # returns 0 if ifup is currently working on this interface ifup_on_iface() { ps axhww | grep -qs "[i]fup.* $INTERFACE\>" diff --git a/scripts/ifup b/scripts/ifup index e56fba2..ea02c8b 100755 --- a/scripts/ifup +++ b/scripts/ifup @@ -139,20 +139,22 @@ test -f scripts/functions.common \ # Get a configuration name if [ -z "$CONFIG" ] ; then - read CONFIG < <(read_cached_config_data config $INTERFACE) + read CONFIG < <(read_cached_config_data config "$INTERFACE") fi if [ -z "$CONFIG" ] ; then CONFIG=$INTERFACE fi +# Check valid interface name length and content +if [ ${#INTERFACE} -gt 15 ] ; then + message "`printf " %-9s: interface name too long" "$INTERFACE"`" + exit $R_ERROR +elif ! is_valid_interface_name "$INTERFACE" ; then + message "`printf " %-9s: invalid interface name" "$INTERFACE"`" + exit $R_ERROR +fi + case $SCRIPTNAME in - ifup) - if [ ${#INTERFACE} -gt 15 ] ; then - message "`printf " %-9s: name too long" "$INTERFACE"`" - exit $R_ERROR - #exit $R_NOCONFIG - fi - ;; ifprobe) IFUPFILE=$RUN_FILES_BASE/ifup-$INTERFACE if [ ! -e "$IFUPFILE" ] ; then -- 1.7.10.4 ++++++ 0008-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch ++++++ >From 9bb6f64db086f0364f153ba142b5f3be67ce4baf Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Thu, 25 Oct 2012 16:30:51 +0200 References: bnc#716652 Subject: [PATCH] ifup-wireless: do not fail on unsupported power options The power management support differs from driver to driver; complain, but do not forward errors (cause ifup failures) when the specified power operation is not supported ... --- scripts/ifup-wireless | 14 ++++++++------ 1 Datei geändert, 8 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/scripts/ifup-wireless b/scripts/ifup-wireless index e0b7caa..4ad4f61 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -783,20 +783,22 @@ case $ACTION in ""|none) ;; yes) run_iw_tool config power period 2 if [ $RETVAL -eq 250 ]; then - # The power operation is invalid or unsupported. + # The power operations may be not supported by the + # driver and not all driver support all modes ... iwconfig $INTERFACE power off 2> /dev/null - # If the power operation is unsupported, ignore the error. - [ $? -eq 250 ] && RETVAL=$R_SUCCESS + # Error were logged/displayed ... don't fail here. + RETVAL=$R_SUCCESS fi ;; no|off) run_iw_tool config power off # If the power operation is unsupported, ignore the error. [ $RETVAL -eq 250 ] && RETVAL=$R_SUCCESS ;; *) run_iw_tool config power $WIRELESS_POWER if [ $RETVAL -eq 250 ]; then - # The power operation is invalid or unsupported. + # The power operations may be not supported by the + # driver and not all driver support all modes ... iwconfig $INTERFACE power off 2> /dev/null - # If the power operation is unsupported, ignore the error. - [ $? -eq 250 ] && RETVAL=$R_SUCCESS + # Error were logged/displayed ... don't fail here. + RETVAL=$R_SUCCESS fi ;; esac -- 1.7.10.4 ++++++ 0009-rcnetwork-no-dhcp-in-background-report-to-systemd.patch ++++++ >From 37c3f35ab98675952aa3aed673575553617cefec Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Tue, 13 Nov 2012 15:13:43 +0100 References: bnc#785240,bnc#780644 Subject: [PATCH] rcnetwork: no dhcp in background report to systemd --- scripts/network | 4 +++- 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/scripts/network b/scripts/network index 3abdb5c..cd4f741 100755 --- a/scripts/network +++ b/scripts/network @@ -752,7 +752,9 @@ status() { ;; $R_DHCP_BG) if [ -f "$NETWORK_RUNFILE" -a "$M" = yes ] ; then - : $((F++)) + if [ "$SD_RUNNING" != "yes" ] ; then + : $((F++)) + fi fi rc_startmode="${esc}[1A${stat}${attn}waiting${norm}" echo -e "$rc_startmode" 1>&2 -- 1.7.10.4 ++++++ 0010-Execute-netconfig-ntp-runtime-update-in-background.patch ++++++ >From 0a544aa9bbdedc0072988e87fcf6f6bcafb4fbb7 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Fri, 23 Nov 2012 10:32:51 +0100 References: bnc#780644 Subject: [PATCH] Execute netconfig/ntp-runtime update in background --- scripts/netconfig.d/ntp-runtime | 48 +++++++++++++++++++++++---------------- 1 Datei geändert, 29 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) diff --git a/scripts/netconfig.d/ntp-runtime b/scripts/netconfig.d/ntp-runtime index 8f83d8e..fff58d7 100755 --- a/scripts/netconfig.d/ntp-runtime +++ b/scripts/netconfig.d/ntp-runtime @@ -231,26 +231,36 @@ fi # here we should restart services if needed -# -# do not restart or it may (will) block ifup -# just try to add the server at runtime ... -# -NTP_CONF="/etc/ntp.conf" -NTPDC_BIN="/usr/sbin/ntpdc" - -if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && /etc/init.d/ntp status >/dev/null 2>/dev/null ; then - NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF) - NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF) - NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && awk '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS) - - if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then - for server in ${NTP_SERVER_LIST[*]} ; do - NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n" - NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN) - debug "$PROGNAME add-server: $server" - done +do_runtime_update() +{ + # + # do not restart or it may (will) block ifup + # just try to add the server at runtime ... + # + NTP_CONF="/etc/ntp.conf" + NTPDC_BIN="/usr/sbin/ntpdc" + + if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && \ + /etc/init.d/ntp status >/dev/null 2>/dev/null ; then + NTP_KEYS=$(awk -- '/^keys/ { print $2 }' $NTP_CONF 2>/dev/null) + NTP_KEYID=$(awk -- '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF 2>/dev/null) + NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && \ + awk -- '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" \ + $NTP_KEYS 2>/dev/null) + + if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then + for server in ${NTP_SERVER_LIST[*]} ; do + NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n" + NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN 2>&1 >/dev/null) + debug "$PROGNAME add-server $server: $NTPDC_LOG" + done + fi fi -fi +} + +# runtime update always in background +( do_runtime_update & ) +disown -a exit 0; -- 1.7.10.4 ++++++ 0011-ifup-bridge-handle-1-100-sec-precision-stp-times.patch ++++++ >From 10b065baff8e0ce7d58d8d27bedce15f4f0e1092 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Tue, 8 Jan 2013 15:38:59 +0100 Subject: [PATCH] ifup-bridge: handle 1/100 sec precision stp times References: bnc#753387,bnc#794720 Upstream: yes --- scripts/ifup-bridge | 14 +++++++++++--- 1 Datei geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/scripts/ifup-bridge b/scripts/ifup-bridge index 47e8993..ea717af 100755 --- a/scripts/ifup-bridge +++ b/scripts/ifup-bridge @@ -95,19 +95,27 @@ apply_constraints() local -i min=$(($2)) local -i max=$(($3)) local def=$4 + local val=${!var} + local tmp - test -n "${!var}" || return - if test $((${!var})) -lt $min ; then + case $val in + "") return 0 ;; + *[,.]*) tmp=${val##*[.,]} + val=$((${val%%[.,]*} * 100 + ${tmp:0:2})) ;; + *) val=$(($val * 100)) ;; + esac + if test $((${val})) -lt $(($min * 100)) ; then def=${def:-$min} message_if_not_run_from_rc \ "Warning: Correcting $var from ${!var} to $def" eval "${var}=$def" - elif test $((${!var})) -gt $max ; then + elif test $((${val})) -gt $(($max * 100)) ; then def=${def:-$max} message_if_not_run_from_rc \ "Warning: Correcting $var from ${!var} to $def" eval "${var}=$def" fi + return 0 } ###################################################################### -- 1.7.10.4 ++++++ 0012-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch ++++++ >From 122abfa7b7142079e911645937a9d8fb78faf37c Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <m...@suse.com> Date: Mon, 7 Jan 2013 11:38:11 +0100 Subject: [PATCH] Updated bridge documentation link in ifcfg-bridge.5 References: bnc#791553 Upstream: yes --- doc/ifcfg-bridge.5 | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/doc/ifcfg-bridge.5 b/doc/ifcfg-bridge.5 index 5610262..f14c9a7 100644 --- a/doc/ifcfg-bridge.5 +++ b/doc/ifcfg-bridge.5 @@ -86,7 +86,7 @@ Minimal example for a bridge interface on eth0 and eth1, the bridge interface it .SH ADDITIONAL INFORMATION For additional and more general information have a look into -.BR <http://linux-net.osdl.org/index.php/Bridge>. +.BR <http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge>. .SH BUGS Please report bugs at <https://bugzilla.novell.com/index.cgi> -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
