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