From 130aa2e1b365c59cd2764a9a66ac23f421e35eb5 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 19 Mar 2014 10:16:53 +0100 Subject: ifup: add possibility to specify value for -w parameter of arping Conflicts: sysconfig/network-scripts/ifup-aliases sysconfig/network-scripts/ifup-eth --- sysconfig/network-scripts/ifup-aliases | 2 +- 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 -- cgit v1.2.1