Blame 0122-network-dhclient-exit-arping-immediatly-if-we-get-an.patch
|
Harald Hoyer |
bb31e7 |
From 4483fff87c0a5074f3498bfd59387179c20c7ea3 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
bb31e7 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
bb31e7 |
Date: Tue, 18 Aug 2015 12:41:12 +0200
|
|
Harald Hoyer |
bb31e7 |
Subject: [PATCH] network/dhclient: exit arping immediatly, if we get an answer
|
|
Harald Hoyer |
bb31e7 |
|
|
Harald Hoyer |
bb31e7 |
(cherry picked from commit d6bfa7052a620ebdd37f78655462120871c49ebd)
|
|
Harald Hoyer |
bb31e7 |
---
|
|
Harald Hoyer |
bb31e7 |
modules.d/40network/dhclient-script.sh | 2 +-
|
|
Harald Hoyer |
bb31e7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Harald Hoyer |
bb31e7 |
|
|
Harald Hoyer |
bb31e7 |
diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
|
|
Harald Hoyer |
bb31e7 |
index 1d891cd..4e2090d 100755
|
|
Harald Hoyer |
bb31e7 |
--- a/modules.d/40network/dhclient-script.sh
|
|
Harald Hoyer |
bb31e7 |
+++ b/modules.d/40network/dhclient-script.sh
|
|
Harald Hoyer |
bb31e7 |
@@ -117,7 +117,7 @@ case $reason in
|
|
Harald Hoyer |
bb31e7 |
read layer2 < /sys/class/net/$netif/device/layer2
|
|
Harald Hoyer |
bb31e7 |
fi
|
|
Harald Hoyer |
bb31e7 |
if [ "$layer2" != "0" ]; then
|
|
Harald Hoyer |
bb31e7 |
- if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
|
|
Harald Hoyer |
bb31e7 |
+ if ! arping -f -q -D -c 2 -I $netif $new_ip_address ; then
|
|
Harald Hoyer |
bb31e7 |
warn "Duplicate address detected for $new_ip_address while doing dhcp. retrying"
|
|
Harald Hoyer |
bb31e7 |
exit 1
|
|
Harald Hoyer |
bb31e7 |
fi
|