Browse Source

network: do not arping with qeth layer3 interfaces

https://bugzilla.redhat.com/show_bug.cgi?id=825783
master
Harald Hoyer 13 years ago
parent
commit
8b88dc7f71
  1. 7
      modules.d/40network/dhclient-script.sh
  2. 10
      modules.d/40network/net-lib.sh

7
modules.d/40network/dhclient-script.sh

@ -66,10 +66,17 @@ case $reason in @@ -66,10 +66,17 @@ case $reason in
;;
BOUND)
echo "dhcp: BOND setting $netif"
unset layer2
if [ -f /sys/class/net/$netif/device/layer2 ]; then
read layer2 < /sys/class/net/$netif/device/layer2
fi
if [ "$layer2" != "0" ]; then
if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
exit 1
fi
fi
unset layer2
setup_interface
set | while read line; do
[ "${line#new_}" = "$line" ] && continue

10
modules.d/40network/net-lib.sh

@ -95,9 +95,17 @@ setup_net() { @@ -95,9 +95,17 @@ setup_net() {
else
dest="$gw_ip"
fi
if [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then

unset layer2
if [ -f /sys/class/net/$netif/device/layer2 ]; then
read layer2 < /sys/class/net/$netif/device/layer2
fi

if [ "$layer2" != "0" ] && [ -n "$dest" ] && ! arping -q -f -w 60 -I $netif $dest ; then
info "Resolving $dest via ARP on $netif failed"
fi
unset layer2

> /tmp/net.$netif.did-setup
}


Loading…
Cancel
Save