[PATCH rhel6-branch] Fix config of ipv6 and ipv4 (auto + manual) in loader (#609576)

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

If auto for one ip version and manual for the other was selected
in loader, the manual configuration was ignored.
---
 loader/net.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 331c4e2..dac3501 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -720,26 +720,25 @@ int configureTCPIP(char * device, iface_t * iface,
         }
 #endif
 
+
+
         /* do interface configuration (call DHCP here, or return for manual) */
 #ifdef ENABLE_IPV6
-        if ((!FL_NOIPV4(flags) && iface->ipv4method == IPV4_DHCP_METHOD) ||
-            (!FL_NOIPV6(flags) && (iface->ipv6method == IPV6_AUTO_METHOD ||
-                                   iface->ipv6method == IPV6_DHCP_METHOD))) {
+        if ((!FL_NOIPV4(flags) && iface->ipv4method == IPV4_MANUAL_METHOD) ||
+            (!FL_NOIPV6(flags) && iface->ipv6method == IPV6_MANUAL_METHOD)) {
 #else
-        if (!FL_NOIPV4(flags) && iface->ipv4method == IPV4_DHCP_METHOD) {
+        if (!FL_NOIPV4(flags) && iface->ipv4method == IPV4_MANUAL_METHOD) {
 #endif
-            /* DHCP selected, exit the loop */
-            ret = LOADER_NOOP;
+            /* manual IP configuration selected */
+            ret = LOADER_OK;
             i = 1;
 #ifdef ENABLE_IPV6
-        } else if ((!FL_NOIPV4(flags) && iface->ipv4method == IPV4_MANUAL_METHOD) ||
-                   (!FL_NOIPV6(flags) && iface->ipv6method == IPV6_MANUAL_METHOD)) {
+        } else if (!FL_NOIPV4(flags) || !FL_NOIPV6(flags)) {
 #else
-        } else if (!FL_NOIPV4(flags) && iface->ipv4method == IPV4_MANUAL_METHOD) {
+        } else if (!FL_NOIPV4(flags)) {
 #endif
-
-            /* manual IP configuration selected */
-            ret = LOADER_OK;
+            /* only auto configuration selected, exit the loop */
+            ret = LOADER_NOOP;
             i = 1;
         }
     } while (i != 1);
-- 
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list