From b6a3a1dd5d783229a2bb6e42993fe6b09e0583d2 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 5 Jan 2016 13:35:21 +0100 Subject: ifup-eth: if arping fails, output responding MAC Resolves: #1099026 --- sysconfig/network-scripts/ifup-aliases | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sysconfig/network-scripts/ifup-aliases') diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index ad44964b..fbc15470 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -267,9 +267,10 @@ function new_interface () is_available ${parent_device} && \ ( grep -qswi "up" /sys/class/net/${parent_device}/operstate || grep -qswi "1" /sys/class/net/${parent_device}/carrier ) ; then echo $"Determining if ip address ${IPADDR} is already in use for device ${parent_device}..." - /sbin/arping -q -c 2 -w ${ARPING_WAIT:-3} -D -I ${parent_device} ${IPADDR} + ARPING=$(/sbin/arping -c 2 -w ${ARPING_WAIT:-3} -D -I ${parent_device} ${IPADDR}) if [ $? = 1 ]; then - net_log $"Error, some other host already uses address ${IPADDR}." + ARPINGMAC=$(echo $ARPING | sed -ne 's/.*\[\(.*\)\].*/\1/p') + net_log $"Error, some other host ($ARPINGMAC) already uses address ${IPADDR}." return 1 fi fi -- cgit v1.2.1