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.
29 lines
778 B
29 lines
778 B
6 years ago
|
From 42896820ba1bba0da86e783ac6e1e4951a9acf88 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Harald Hoyer <harald@redhat.com>
|
||
|
|
Date: Tue, 25 Mar 2014 15:39:56 +0100
|
||
|
|
Subject: [PATCH] network: handle "ip=dhcp6" for all interfaces
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1064365
|
||
|
|
---
|
||
|
|
modules.d/40network/ifup.sh | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
||
|
|
index 51b0d528..ede01883 100755
|
||
|
|
--- a/modules.d/40network/ifup.sh
|
||
|
|
+++ b/modules.d/40network/ifup.sh
|
||
|
|
@@ -364,7 +364,12 @@ fi
|
||
|
|
|
||
|
|
# no ip option directed at our interface?
|
||
|
|
if [ ! -e /tmp/net.${netif}.up ]; then
|
||
|
|
- do_dhcp -4
|
||
|
|
+ if getargs 'ip=dhcp6'; then
|
||
|
|
+ load_ipv6
|
||
|
|
+ do_dhcp -6
|
||
|
|
+ else
|
||
|
|
+ do_dhcp -4
|
||
|
|
+ fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
exit 0
|