You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
From da63c0de561ce9ed158cc2438a1cc5fbb38c3758 Mon Sep 17 00:00:00 2001 |
|
From: WANG Chao <chaowang@redhat.com> |
|
Date: Fri, 13 Sep 2013 22:28:44 +0800 |
|
Subject: [PATCH] ifup: do not dhcp on network interface of secondary stack |
|
|
|
Configure cmdline to: |
|
ip=br0:dhcp bridge=br0:bond0 bond=bond0:eth0 |
|
|
|
By default ifup bond0 will run dhcp on bond0, which is wrong. bond0 |
|
isn't the top interface. we should really run dhcp on br0. |
|
|
|
So if we ifup an network interface on secondary stack, we should not |
|
dhcp. Fix this issue with this patch. |
|
--- |
|
modules.d/40network/ifup.sh | 7 +++++++ |
|
1 file changed, 7 insertions(+) |
|
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh |
|
index 32616470..9f6f4494 100755 |
|
--- a/modules.d/40network/ifup.sh |
|
+++ b/modules.d/40network/ifup.sh |
|
@@ -336,6 +336,13 @@ for p in $(getargs ip=); do |
|
exit 0 |
|
done |
|
|
|
+# netif isn't the top stack? Then we should exit here. |
|
+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp |
|
+# bond0 doesn't make sense. |
|
+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then |
|
+ exit 0 |
|
+fi |
|
+ |
|
# no ip option directed at our interface? |
|
if [ ! -e /tmp/setup_net_${netif}.ok ]; then |
|
do_dhcp -4
|
|
|