diff options
| -rw-r--r-- | initscripts.spec | 7 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index e75d5bcb..65a65839 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.58 +Version: 9.59 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -14,7 +14,7 @@ Requires: module-init-tools Requires: util-linux >= 2.16 Requires: bash >= 3.0 Requires: procps-ng >= 3.3.8-16 -Conflicts: systemd < 23-1 +Conflicts: systemd < 216-3 Conflicts: systemd-units < 23-1 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Nov 12 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.59-1 +- adjust LINKDELAY when STP is on + * Thu Nov 06 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.58-1 - ifup,vlan: fix typo - doc: be consistent and use BOOTPROTO=none diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 49a7d503..b77e3f49 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -1,6 +1,6 @@ #!/bin/bash # Network Interface Configuration System -# Copyright (c) 1996-2010 Red Hat, Inc. all rights reserved. +# Copyright (c) 1996-2014 Red Hat, Inc. all rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2, @@ -78,6 +78,15 @@ if [ "${TYPE}" = "Bridge" ]; then value=${arg##*=}; echo $value > /sys/class/net/${DEVICE}/bridge/$key done + # set LINKDELAY (used as timeout when calling check_link_down()) + # to at least (${DELAY} * 2) + 7 if STP is enabled. This is the + # minimum time required for /sys/class/net/$REALDEVICE/carrier to + # become 1 after "ip link set dev $DEVICE up" is called. + if [ "${STP}" = "yes" -o "${STP}" = "on" ]; then + TMPD=7 + [ -n "${DELAY}" ] && TMPD=$(expr ${DELAY} \* 2 + ${TMPD}) + [ 0$LINKDELAY -lt $TMPD ] && LINKDELAY=$TMPD + fi fi # Create tap device. |