diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2014-03-19 10:16:53 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2014-03-26 14:41:43 +0100 |
| commit | 130aa2e1b365c59cd2764a9a66ac23f421e35eb5 (patch) | |
| tree | 83b6149436d0580bd057cccebfaf776a813b7165 /sysconfig | |
| parent | 67de6608c01dadad7beb368213066a9a40320baf (diff) | |
| download | initscripts-130aa2e1b365c59cd2764a9a66ac23f421e35eb5.tar initscripts-130aa2e1b365c59cd2764a9a66ac23f421e35eb5.tar.gz initscripts-130aa2e1b365c59cd2764a9a66ac23f421e35eb5.tar.bz2 initscripts-130aa2e1b365c59cd2764a9a66ac23f421e35eb5.tar.xz initscripts-130aa2e1b365c59cd2764a9a66ac23f421e35eb5.zip | |
ifup: add possibility to specify value for -w parameter of arping
Conflicts:
sysconfig/network-scripts/ifup-aliases
sysconfig/network-scripts/ifup-eth
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifup-aliases | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 3f794951..349b4f5b 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -262,7 +262,7 @@ function new_interface () is_available ${parent_device} && \ grep -qswi "up" /sys/class/net/${parent_device}/operstate ; then echo $"Determining if ip address ${IPADDR} is already in use for device ${parent_device}..." - if ! /sbin/arping -q -c 2 -w 3 -D -I ${parent_device} ${IPADDR} ; then + if ! /sbin/arping -q -c 2 -w ${ARPING_WAIT:-3} -D -I ${parent_device} ${IPADDR} ; then net_log $"Error, some other host already uses address ${IPADDR}." return 1 fi diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 6180ae45..24f212f0 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -240,7 +240,7 @@ else if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C grep -q "${ipaddr[$idx]}/${prefix[$idx]}" ; then if [ "${REALDEVICE}" != "lo" ] && [ "${arpcheck[$idx]}" != "no" ] ; then echo $"Determining if ip address ${ipaddr[$idx]} is already in use for device ${REALDEVICE}..." - if ! /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]} ; then + if ! /sbin/arping -q -c 2 -w ${ARPING_WAIT:-3} -D -I ${REALDEVICE} ${ipaddr[$idx]} ; then net_log $"Error, some other host already uses address ${ipaddr[$idx]}." exit 1 fi |