commit sysconfig.1220 for openSUSE:12.1:Update
Hello community,
here is the log from the commit of package sysconfig.1220 for openSUSE:12.1:Update checked in at 2013-01-21 12:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update/sysconfig.1220 (Old)
and /work/SRC/openSUSE:12.1: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.1:Update/.sysconfig.1220.new/sysconfig.changes 2013-01-21 12:23:35.000000000 +0100
@@ -0,0 +1,4827 @@
+------------------------------------------------------------------
+Tue Jan 8 17:10:23 UTC 2013 - mt@suse.de
+
+- Fixed to correctly apply STP constrains also to float time
+ values with a 1/100 sec precision (bnc#753387,bnc#794720).
+ [0030-ifup-bridge-handle-1-100-sec-precision-stp-times.patch]
+- Updated bridge documentation link in ifcfg-bridge.5 (bnc#791553).
+ [0031-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch]
+
+------------------------------------------------------------------
+Thu Dec 6 13:40:31 UTC 2012 - mt@suse.com
+
+- Execute netconfig/ntp-runtime update in background, so dhcp post
+ processing works faster when ntpdc needs a while (bnc#780644).
+ [0029-Execute-netconfig-ntp-runtime-update-in-background.patch]
+- 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.
+ [0028-rcnetwork-no-dhcp-in-background-report-to-systemd.patch]
+- 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).
+ [0027-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).
+ [0024-ifup-fail-early-for-too-long-interface-names.patch,
+ 0025-network-do-not-wait-for-virtuals-reporting-errors.patch,
+ 0026-ifup-check-for-valid-characters-in-interface-names.patch]
+- 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).
+ [0023-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).
+ [0020-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch,
+ 0021-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch,
+ 0022-modprobe-af_packet-early-before-link-set-up.patch]
+- Check before running a script in netcontrol_services (bnc#775281).
+ [0019-Check-before-running-a-script-in-netcontrol_services.patch]
+
+------------------------------------------------------------------
+Wed Jun 20 07:49:30 UTC 2012 - mt@suse.com
+
+- Fixed to differentiate ib/ibchild/bond runtime types to stop
+ ib bond interfaces correctly via ifdown-bond.
+- Fixed ifup-bridge apply stp contstrains when STP is enabled
+ (bnc#753387)
+- Fixed ifup-route to use -4/6 option for ip route and to not
+ require explicit dummy gateway for multicast routes in the
+ routes config (bnc#745252).
+
+------------------------------------------------------------------
+Thu May 24 09:22:26 UTC 2012 - mt@suse.com
+
+- 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).
+
+------------------------------------------------------------------
+Wed May 23 15:05:29 UTC 2012 - mt@suse.com
+
+- Fixed ifrenew-dhcp to use built-in dhcpcd --renew (bnc#763533).
+
+------------------------------------------------------------------
+Wed Mar 14 12:41:45 UTC 2012 - mt@suse.com
+
+- 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.
+
+------------------------------------------------------------------
+Wed Feb 29 10:33:28 UTC 2012 - mt@suse.com
+
+- Enabled to always enable the -o boot under systemd, improved
+ to use PID in log messages and extradebug outputs (bnc#737636).
+- 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!
+
+------------------------------------------------------------------
+Tue Jan 10 09:46:26 UTC 2012 - mt@suse.com
+
+- Explicitly disabled posix mode in all bash scripts as we are
+ using several features not supported in posix mode (bnc#739338).
+
+------------------------------------------------------------------
+Thu Jan 5 17:48:18 UTC 2012 - mt@suse.com
+
+- 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).
+
+------------------------------------------------------------------
+Wed Jan 4 18:40:19 UTC 2012 - mt@suse.com
+
+- 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).
+- Added X-Systemd-RemainAfterExit: true LSB header (bnc#727771)
+- 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).
+
+------------------------------------------------------------------
+Mon Dec 19 09:41:09 UTC 2011 - mt@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.
+- 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).
+
+------------------------------------------------------------------
+Fri Oct 21 11:35:06 UTC 2011 - mt@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 - mt@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 - mt@suse.com
+
+- Fixed inverted link ready return value test
+
+------------------------------------------------------------------
+Mon Sep 26 10:09:23 UTC 2011 - mt@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 - mt@suse.com
+
+- version 0.75.2
+- Added additional state for network-remotefs, so correct status
+ is shown after remotefs has been stopped. Stopping localfs,
+ stops remotefs when it is started as well (bnc#592270).
+- Use max_bonds=0 bond modprobe option to avoid automatic bond0
+ interface creation as we may need a different name.
+ Do not set the bond interface link up before enslaving - this
+ is not needed by bonding any more with current kernels.
+
+------------------------------------------------------------------
+Mon Sep 5 09:07:58 UTC 2011 - mt@suse.com
+
+- version 0.75.1
+- Warn and ask the user to report a bug when the ifcfg defines the
+ INTERFACETYPE variable to override behaviour of ifup: There is a
+ bug in ifup when it is required to define it (bnc#711762).
+ Improved also variable description in ifcfg.5 manual page.
+- Added missed dhcp4,dhcp6,ibft,none BOOTPROTO values to
+ ifcfg.template (bnc#701000).
+- Added WIRELESS_AUTH_MODE='no-encryption' option handling to
+ ifup-wireless, because YaST sets it (bnc#648830).
+- Fixed get_depending_ifaces to not return bonding slaves by
+ default as it is not required to stop the slaves before the
+ bonding master goes down and in fact it may cause a system
+ hang, when the slaves are infiniband child interfaces, that
+ are deleted while ifdown (bnc#698478).
+
+-------------------------------------------------------------------
+Mon Aug 29 10:03:13 UTC 2011 - fcrozat@suse.com
+
+- Fix incorrect systemd detection in disable-NM-under-systemd.patch
+
+-------------------------------------------------------------------
+Fri Aug 26 22:02:59 UTC 2011 - mt@suse.com
+
+- Added vpnc to the default list of preferred services for DNS
+ ranking (NETCONFIG_DNS_RANKING=auto).
+
+-------------------------------------------------------------------
+Thu Aug 25 09:32:55 UTC 2011 - fcrozat@suse.com
+
++++ 4630 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update/.sysconfig.1220.new/sysconfig.changes
New:
----
0001-sysconfig-nm-online-timeout-0-default.patch
0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch
0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch
0004-Do-not-suggest-dropped-dhcp6c-client.patch
0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch
0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch
0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch
0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch
0010-network-start-fails-under-systemd.test.patch
0011-Test-if-scripts-used-in-77-network.rules-exists.patch
0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch
0013-Fixed-ifrenew-dhcp-to-use-built-in-dhcpcd-renew.patch
0014-X-Systemd-RemainAfterExit-LSB-tag-before-Description.patch
0015-Do-not-force-dummy-gateway-for-multicast-routes.patch
0016-Fixed-use-of-4-6-option-for-ip-route-bnc-745252.patch
0017-ifup-bridge-apply-stp-contstrains-when-STP-is-on.patch
0018-Fixed-to-differentiate-ib-ibchild-bond-types.patch
0019-Check-before-running-a-script-in-netcontrol_services.patch
0020-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch
0021-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch
0022-modprobe-af_packet-early-before-link-set-up.patch
0023-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch
0024-ifup-fail-early-for-too-long-interface-names.patch
0025-network-do-not-wait-for-virtuals-reporting-errors.patch
0026-ifup-check-for-valid-characters-in-interface-names.patch
0027-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch
0028-rcnetwork-no-dhcp-in-background-report-to-systemd.patch
0029-Execute-netconfig-ntp-runtime-update-in-background.patch
0030-ifup-bridge-handle-1-100-sec-precision-stp-times.patch
0031-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch
sysconfig-0.75.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.75.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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2
Patch1: 0001-sysconfig-nm-online-timeout-0-default.patch
Patch2: 0002-Fixed-order-of-addr-flush-and-link-down-in-ifdown.patch
Patch3: 0003-CVE-2011-4182-fixed-quoting-in-ifservices-script.patch
Patch4: 0004-Do-not-suggest-dropped-dhcp6c-client.patch
Patch5: 0005-Added-X-Systemd-RemainAfterExit-true-LSB-init-header.patch
Patch6: 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch
Patch7: 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch
Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch
Patch9: 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch
Patch10: 0010-network-start-fails-under-systemd.test.patch
Patch11: 0011-Test-if-scripts-used-in-77-network.rules-exists.patch
Patch12: 0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch
Patch13: 0013-Fixed-ifrenew-dhcp-to-use-built-in-dhcpcd-renew.patch
Patch14: 0014-X-Systemd-RemainAfterExit-LSB-tag-before-Description.patch
Patch15: 0015-Do-not-force-dummy-gateway-for-multicast-routes.patch
Patch16: 0016-Fixed-use-of-4-6-option-for-ip-route-bnc-745252.patch
Patch17: 0017-ifup-bridge-apply-stp-contstrains-when-STP-is-on.patch
Patch18: 0018-Fixed-to-differentiate-ib-ibchild-bond-types.patch
Patch19: 0019-Check-before-running-a-script-in-netcontrol_services.patch
Patch20: 0020-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch
Patch21: 0021-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch
Patch22: 0022-modprobe-af_packet-early-before-link-set-up.patch
Patch23: 0023-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch
Patch24: 0024-ifup-fail-early-for-too-long-interface-names.patch
Patch25: 0025-network-do-not-wait-for-virtuals-reporting-errors.patch
Patch26: 0026-ifup-check-for-valid-characters-in-interface-names.patch
Patch27: 0027-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch
Patch28: 0028-rcnetwork-no-dhcp-in-background-report-to-systemd.patch
Patch29: 0029-Execute-netconfig-ntp-runtime-update-in-background.patch
Patch30: 0030-ifup-bridge-handle-1-100-sec-precision-stp-times.patch
Patch31: 0031-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch
%description
This package provides the SuSE system configuration scheme and
the netcontrol alias ifup network scripts.
Authors:
--------
Olaf Kirch
From 578a4f46906883e376ec36261bdaee4e823421da Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 10 Oct 2011 13:13:49 +0200 Subject: [PATCH] Changed NM_ONLINE_TIMEOUT default to 0
Changed NM_ONLINE_TIMEOUT default back to 0 to avoid
unneeded waiting for NM interfaces at boot (bnc#722304)
Signed-off-by: Marius Tomaschewski
From d844f0ceb913a60e2c88b1097c98aa0b4486288f Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Fri, 18 Nov 2011 13:47:26 +0100 Subject: [PATCH] Fixed order of addr flush and link down in ifdown
Changed the order of ip addr flush and ip link set down calls
in ifdown as it does not trigger the ipv6 sysctl tree removal
(bnc#580018,bnc#559170).
Signed-off-by: Marius Tomaschewski
From 74f224c74c2c463365b0d39c14117870ce5776d5 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Fri, 16 Dec 2011 16:03:15 +0100 Subject: [PATCH] CVE-2011-4182 - fixed quoting in ifservices script
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.
Signed-off-by: Marius Tomaschewski
From b4a890149ada6af9b506c9c46157d4446b71c04a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 5 Dec 2011 17:36:22 +0100 Subject: [PATCH] Do not suggest dropped dhcp6c client
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).
Signed-off-by: Marius Tomaschewski
From 274cae3140475adf57db9c02c6f4eba4a2b2eeb9 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 5 Dec 2011 17:40:13 +0100 Subject: [PATCH] Added X-Systemd-RemainAfterExit: true LSB init header
Signed-off-by: Marius Tomaschewski
From de6254ddb293a9f26855e9111e42e1af2b5f1355 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Thu, 5 Jan 2012 17:50:10 +0100 Subject: [PATCH] Fixed ipv6 dad / link ready wait time calculation (bnc#697929)
Signed-off-by: Marius Tomaschewski
From de8b5666d145d0846f7e031f5ce2e7cc70417763 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Thu, 5 Jan 2012 17:56:33 +0100 Subject: [PATCH] Use link_ready_wait instead of up flag check loop
A loop checking the link UP flag was immediately successful
and thus useless. Use a short 3 sec link_ready_wait instead
to give the kernel some time to apply scope local address
and start async tasks like IPv6 dad and avoid some of the
initial send errors reported by dhclient6 (bnc#697929).
Signed-off-by: Marius Tomaschewski
From e2b9aae8ff1601b9a93038eba7eadc4cc4a9718a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 9 Jan 2012 19:56:52 +0100 Subject: [PATCH] Disabled bash posix mode to allow bash features
Signed-off-by: Marius Tomaschewski
From 9406966c8f3028c18c21c261a41aa6b386340fee Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 25 Jan 2012 10:59:55 +0100 Subject: [PATCH] Filter out labeled ipv4 addresses in get_ipv4address
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!
Signed-off-by: Marius Tomaschewski
From 4ee376fb64ac023cdaa6c78f4c1768e4f0986414 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:50:14 +0100 Subject: [PATCH 1/3] Use all args in scripts/extradebug file names
Signed-off-by: Marius Tomaschewski
From ee9d2a28663852349bbf8a1eb315bba796f56b35 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:51:45 +0100 Subject: [PATCH 2/3] Always enable boot-wait mode under systemd
Signed-off-by: Marius Tomaschewski
From e52f94ed16596cb123ea7801ceb849c30e483447 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 15 Feb 2012 18:50:58 +0100 Subject: [PATCH 3/3] Include PID in log messages
Signed-off-by: Marius Tomaschewski
From 032c457bf1adff3968c4f371b78db638a05c0f17 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 14 Mar 2012 13:21:53 +0100 Subject: [PATCH] Test if scripts used in 77-network.rules exists
Added tests to the 77-network.rules rule file if the /sbin/ifup
and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775).
Also disabled the IMO obsolete ipw3945d.sh script run completely.
Signed-off-by: Marius Tomaschewski
From 5fa0d2636eb015b058470ecf6cfb6da40df59cb0 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 14 Mar 2012 13:33:03 +0100 Subject: [PATCH] Corrected IMPORT in hardware/81-mount.rules
Use IMPORT{program}="udevmountd" instead of IMPORT="udevmountd"
as needed by more actual udev versions (>= udev-128, udev-181
does not understand it rules without {program} any more).
Signed-off-by: Marius Tomaschewski
From b7054f1aab5d3e555aa95a6ebdc10bbed21a0f92 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 23 May 2012 16:39:56 +0200 Subject: [PATCH] Fixed ifrenew-dhcp to use built-in dhcpcd --renew
Signed-off-by: Marius Tomaschewski
From e07769c4101e68ccb2ca7b25e0bc6ad76d2f155c Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Thu, 24 May 2012 11:01:29 +0200 Subject: [PATCH] X-Systemd-RemainAfterExit LSB tag before Description
Moved X-Systemd-RemainAfterExit LSB tag before Description as
workaround for a LSB parsing bug in systemd for the case that
a not yet fixed systemd is stil in use (bnc#763533).
Signed-off-by: Marius Tomaschewski
From 55080b7d523b74ec25c32861c2d00c862f8a6beb Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 2 Apr 2012 14:08:23 +0200 Subject: [PATCH] Do not force dummy gateway for multicast routes
--- scripts/ifup-route | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/ifup-route b/scripts/ifup-route index 7a9de82..4efaadf 100755 --- a/scripts/ifup-route +++ b/scripts/ifup-route @@ -464,6 +464,7 @@ while read DEST GWAY MASK IFACE TYPE IPOPTS ; do case "$DEST-$INET" in 224.0.0.0*-4|224/4-4) + GWAY=${GWAY:-0.0.0.0} # We are doing multicast if [ -e /proc/net/igmp -a "$GWAY" = 0.0.0.0 \ -a \( "$PFXL" = 4 -o "$DEST" = 224/4 \) ] ; then -- 1.7.7 ++++++ 0016-Fixed-use-of-4-6-option-for-ip-route-bnc-745252.patch ++++++
From d28df4af640f4d7282e1c0d5db627a37238bea24 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 2 Apr 2012 14:10:36 +0200 Subject: [PATCH] Fixed use of -4/6 option for ip route (bnc#745252)
--- scripts/ifup-route | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/scripts/ifup-route b/scripts/ifup-route index 4efaadf..2b8253b 100755 --- a/scripts/ifup-route +++ b/scripts/ifup-route @@ -503,17 +503,15 @@ while read DEST GWAY MASK IFACE TYPE IPOPTS ; do fi ;; *) - FOPT="" case "$GWAY" in 0.0.0.0|\*|::) # Add/Delete a local network / device route GWAY="" - FOPT="-$INET" ;; $DEST) test "$PFXL" = 32 -o "$PFXL" = 128 && GWAY="" ;; esac - run_iproute $FOPT $ACTION to $TYPE $DEST ${GWAY:+via $GWAY} $IFACE $IPOPTS + run_iproute -$INET $ACTION to $TYPE $DEST ${GWAY:+via $GWAY} $IFACE $IPOPTS ;; esac ;; -- 1.7.7 ++++++ 0017-ifup-bridge-apply-stp-contstrains-when-STP-is-on.patch ++++++
From 9f819dc649a92cb192abc5c0e7f29bb0fa89ae19 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 4 Apr 2012 17:33:08 +0200 Subject: [PATCH] ifup-bridge: apply stp contstrains when STP is on (bnc#753387)
--- scripts/ifup-bridge | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/scripts/ifup-bridge b/scripts/ifup-bridge index e2e7c8f..ec04e49 100755 --- a/scripts/ifup-bridge +++ b/scripts/ifup-bridge @@ -89,6 +89,28 @@ test -f ./ifcfg-$CONFIG && . ./ifcfg-$CONFIG SYSFS="/sys/class/net" ###################################################################### +apply_constraints() +{ + local var=$1 + local -i min=$(($2)) + local -i max=$(($3)) + local def=$4 + + test -n "${!var}" || return + if test $((${!var})) -lt $min ; 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 + def=${def:-$max} + message_if_not_run_from_rc \ + "Warning: Correcting $var from ${!var} to $def" + eval "${var}=$def" + fi +} + +###################################################################### case $ACTION in up) @@ -175,6 +197,13 @@ up) # Set flags [ -n "$BRIDGE_AGEINGTIME" ] && brctl setageing "$INTERFACE" "$BRIDGE_AGEINGTIME" [ -n "$BRIDGE_STP" ] && brctl stp "$INTERFACE" "$BRIDGE_STP" + case $BRIDGE_STP in + on) + apply_constraints BRIDGE_FORWARDDELAY 4 30 + apply_constraints BRIDGE_HELLOTIME 1 6 + apply_constraints BRIDGE_MAXAGE 6 40 + ;; + esac [ -n "$BRIDGE_PRIORITY" ] && brctl setbridgeprio "$INTERFACE" "$BRIDGE_PRIORITY" [ -n "$BRIDGE_FORWARDDELAY" ] && brctl setfd "$INTERFACE" "$BRIDGE_FORWARDDELAY" [ -n "$BRIDGE_HELLOTIME" ] && brctl sethello "$INTERFACE" "$BRIDGE_HELLOTIME" -- 1.7.7 ++++++ 0018-Fixed-to-differentiate-ib-ibchild-bond-types.patch ++++++
From 8dfb4d947cb0f6a44aba8d1f982834bf2eeed107 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 11 Jun 2012 12:01:39 +0200 Subject: [PATCH] Fixed to differentiate ib/ibchild/bond types
A bonding using infiniband interfaces (ib or ibchild) were not stopped correctly, because it were handled as ib, not as bond. --- scripts/functions | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/functions b/scripts/functions index 5cb58b8..16f90da 100644 --- a/scripts/functions +++ b/scripts/functions @@ -235,9 +235,13 @@ get_iface_type () { ;; 24) TYPE=eth ;; # firewire ;; # IEEE 1394 IPv4 - RFC 2734 32) # InfiniBand - case $IF in - *.*) TYPE=ibchild ;; *) TYPE=ib ;; - esac + if test -d /sys/class/net/$IF/bonding ; then + TYPE=bond + elif test -d /sys/class/net/$IF/create_child ; then + TYPE=ib + else + TYPE=ibchild + fi ;; 512) TYPE=ppp ;; 768) TYPE=ipip ;; # IPIP tunnel -- 1.7.7 ++++++ 0019-Check-before-running-a-script-in-netcontrol_services.patch ++++++
From 6c61ed93bb28e722ece534826390a76c6b613385 Mon Sep 17 00:00:00 2001 From: Robert Milasan
Date: Thu, 2 Aug 2012 20:01:55 +0200 References: bnc#775281 Subject: [PATCH 01/11] Check before running a script in netcontrol_services
--- scripts/netcontrol_services | 3 +++ 1 Datei geändert, 3 Zeilen hinzugefügt(+) diff --git a/scripts/netcontrol_services b/scripts/netcontrol_services index d0a55b7..340e340 100755 --- a/scripts/netcontrol_services +++ b/scripts/netcontrol_services @@ -32,6 +32,9 @@ cd /etc/sysconfig/network/ || exit 0 test -r ./config && . ./config test -r scripts/functions && . scripts/functions +# Check if there is a script for the action +test -x "scripts/if${2}-services" || exit 0 + E=`iwconfig "${1}" 2>/dev/null | \ sed -n 's/^.*ESSID:\"\([^\"]*\)\".*$/\1/p' | \ sed -e 's/[^abcdefghijklmnopqrstuvwxyz0123456789=._-]/_/gi'` -- 1.7.10.4 ++++++ 0020-Use-dhclient-v-when-debug-is-enabled-bnc-780644.patch ++++++
From e754695aa6e43911cdec81997ca0221f2af82958 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 26 Sep 2012 17:08:51 +0200 References: bnc#780644 Subject: [PATCH 02/11] 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 c235b14..3bbdf92 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -357,7 +357,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 @@ -418,7 +418,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 ++++++ 0021-Added-DHCLIENT_WAIT_LINK-variable-instead-to-hardcod.patch ++++++
From 90a977938744d4b471b28d2d56e80cda7a788afc Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 26 Sep 2012 17:28:35 +0200 References: bnc#780644 Subject: [PATCH 03/11] 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 3bbdf92..c122e42 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -689,7 +689,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 ++++++ 0022-modprobe-af_packet-early-before-link-set-up.patch ++++++
From 86d5fe875765a54eccb58547a9df7d3dfe0ade07 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 26 Sep 2012 17:34:40 +0200 References: bnc#780644 Subject: [PATCH 04/11] 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 c122e42..3bce0ee 100755 --- a/scripts/ifup-dhcp +++ b/scripts/ifup-dhcp @@ -682,6 +682,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 ++++++ 0023-netconfig-ntp-runtime-add-servers-do-not-try-restart.patch ++++++
From 157cda6aab43c319bb7c227ba995be06754c124c Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Wed, 26 Sep 2012 18:57:09 +0200 References: bnc#780644 Subject: [PATCH 05/11] 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 86340e8..88b1baa 100755 --- a/scripts/netconfig.d/ntp-runtime +++ b/scripts/netconfig.d/ntp-runtime @@ -232,10 +232,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 ++++++ 0024-ifup-fail-early-for-too-long-interface-names.patch ++++++
From de3a73f4cc7c46ebac7e34171c2f6465c7a57d0d Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 15 Oct 2012 12:25:06 +0200 References: bnc#784952 Subject: [PATCH 06/11] 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 95da1b0..cb62ccc 100755 --- a/scripts/ifup +++ b/scripts/ifup @@ -144,6 +144,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 ++++++ 0025-network-do-not-wait-for-virtuals-reporting-errors.patch ++++++
From 1a69ec6d96bb1c42a6fd547cabdf88389b002483 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 15 Oct 2012 12:27:08 +0200 References: bnc#784952 Subject: [PATCH 07/11] 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 1fd813f..2735d2a 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 ++++++ 0026-ifup-check-for-valid-characters-in-interface-names.patch ++++++
From 26e8b76f7934fe0e268d35fad2fe0c66c5bedc41 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 15 Oct 2012 14:12:38 +0200 References: bnc#784952 Subject: [PATCH 08/11] ifup: check for valid characters in interface names
From ea0c57bee1760e2c2f9c460da40dd9b7e6bc5c9b Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Thu, 25 Oct 2012 16:30:51 +0200 References: bnc#716652 Subject: [PATCH 09/11] ifup-wireless: do not fail on unsupported power
--- 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 16f90da..ae617fe 100644 --- a/scripts/functions +++ b/scripts/functions @@ -82,6 +82,14 @@ add_to_wordlist() { eval "$v='${l[@]}'" } +is_valid_interface_name() +{ + local LANG=C LC_ALL=C + local INTERFACE="$1" + local IFNAME_RX='^[[:alnum:]._:-]{1,15}$' + [[ ${INTERFACE} =~ ${IFNAME_RX} ]] +} + is_iface_available () { local IFNAME=${1} local IFTYPE=${2:-$INTERFACETYPE} diff --git a/scripts/ifup b/scripts/ifup index cb62ccc..9a35c9a 100755 --- a/scripts/ifup +++ b/scripts/ifup @@ -137,20 +137,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 ++++++ 0027-ifup-wireless-do-not-fail-on-unsupported-power-optio.patch ++++++ 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 a75e8f2..502aeaa 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -785,20 +785,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 ++++++ 0028-rcnetwork-no-dhcp-in-background-report-to-systemd.patch ++++++
From 01f0a1e33f2e3e0a0406b3aa19df4bbdd2557742 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Tue, 13 Nov 2012 15:13:43 +0100 References: bnc#785240,bnc#780644 Subject: [PATCH 10/11] 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 2735d2a..e62a43c 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 ++++++ 0029-Execute-netconfig-ntp-runtime-update-in-background.patch ++++++
From 447f34e724b23048907514ca919145892fe3409b Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Fri, 23 Nov 2012 10:32:51 +0100 References: bnc#780644 Subject: [PATCH 11/11] 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 88b1baa..7f06b42 100755 --- a/scripts/netconfig.d/ntp-runtime +++ b/scripts/netconfig.d/ntp-runtime @@ -232,26 +232,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 ++++++ 0030-ifup-bridge-handle-1-100-sec-precision-stp-times.patch ++++++
From c4e81511d3346e93f2194f6288c057e321ec461e Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
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 ec04e49..0ac9b5d 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 ++++++ 0031-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch ++++++
From 122abfa7b7142079e911645937a9d8fb78faf37c Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de