aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-03-19 10:16:53 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-03-19 10:16:53 +0100
commit2de56366bf82d660cf8ec460769370085358d3da (patch)
tree10ab784fe3f30b280f228d0b96ae89f29472a7a0
parent2f00d21f7d0bf74de4d06d26a4475b91da90a4f7 (diff)
downloadinitscripts-2de56366bf82d660cf8ec460769370085358d3da.tar
initscripts-2de56366bf82d660cf8ec460769370085358d3da.tar.gz
initscripts-2de56366bf82d660cf8ec460769370085358d3da.tar.bz2
initscripts-2de56366bf82d660cf8ec460769370085358d3da.tar.xz
initscripts-2de56366bf82d660cf8ec460769370085358d3da.zip
ifup: add possibility to specify value for -w parameter of arping
-rwxr-xr-xsysconfig/network-scripts/ifup-aliases2
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 9bc815f3..c92a431d 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -260,7 +260,7 @@ function new_interface ()
[ "${parent_device}" != "lo" ] && [ "${ARPCHECK}" != "no" ] && \
is_available ${parent_device} && \
grep -qswi "up" /sys/class/net/${parent_device}/operstate && \
- 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 0606231a..f1d149bb 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -226,7 +226,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
- /sbin/arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${ipaddr[$idx]}
+ /sbin/arping -q -c 2 -w ${ARPING_WAIT:-3} -D -I ${REALDEVICE} ${ipaddr[$idx]}
if [ $? = 1 ]; then
net_log $"Error, some other host already uses address ${ipaddr[$idx]}."
exit 1