Blame 0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch
|
Harald Hoyer |
4734ec |
From 271cd19dbe895c24b1f70fa5c6bbecace3b97f4d Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
4734ec |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
4734ec |
Date: Mon, 2 Dec 2013 10:38:21 +0100
|
|
Harald Hoyer |
4734ec |
Subject: [PATCH] network/ifup.sh: before doing dhcp, check, if the link has a
|
|
Harald Hoyer |
4734ec |
carrier
|
|
Harald Hoyer |
4734ec |
|
|
Harald Hoyer |
4734ec |
---
|
|
Harald Hoyer |
4734ec |
modules.d/40network/ifup.sh | 4 ++++
|
|
Harald Hoyer |
4734ec |
1 file changed, 4 insertions(+)
|
|
Harald Hoyer |
4734ec |
|
|
Harald Hoyer |
4734ec |
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
4734ec |
index 9f6f449..2edcfe6 100755
|
|
Harald Hoyer |
4734ec |
--- a/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
4734ec |
+++ b/modules.d/40network/ifup.sh
|
|
Harald Hoyer |
4734ec |
@@ -87,6 +87,10 @@ do_dhcp() {
|
|
Harald Hoyer |
4734ec |
# dhclient-script will mark the netif up and generate the online
|
|
Harald Hoyer |
4734ec |
# event for nfsroot
|
|
Harald Hoyer |
4734ec |
# XXX add -V vendor class and option parsing per kernel
|
|
Harald Hoyer |
4734ec |
+ if ! iface_has_link $netif; then
|
|
Harald Hoyer |
4734ec |
+ echo "No carrier detected"
|
|
Harald Hoyer |
4734ec |
+ return 1
|
|
Harald Hoyer |
4734ec |
+ fi
|
|
Harald Hoyer |
4734ec |
echo "Starting dhcp for interface $netif"
|
|
Harald Hoyer |
4734ec |
dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \
|
|
Harald Hoyer |
4734ec |
|| echo "dhcp failed"
|