> @@ -676,17 +680,19 @@ int configureTCPIP(char * device, iface_t * iface,
> * ip=<val> noipv6
> * ipv6=<val> noipv4
> */
> - if ((FL_IP_PARAM(flags) && FL_IPV6_PARAM(flags)) ||
> - (FL_IP_PARAM(flags) && FL_NOIPV6(flags)) ||
> - (FL_IPV6_PARAM(flags) && FL_NOIPV4(flags)) ||
> - (FL_NOIPV4(flags) && FL_NOIPV6(flags))) {
> + if ((iface->ipv4method > IPV4_UNUSED_METHOD && iface->ipv6method > IPV6_UNUSED_METHOD) || /* both */
> + (iface->ipv4method > IPV4_UNUSED_METHOD && FL_NOIPV6(flags)) || /* only ipv4 */
> + (FL_NOIPV4(flags) && iface->ipv6method > IPV6_UNUSED_METHOD) || /* only ipv6 */
> + (FL_NOIPV4(flags) && FL_NOIPV6(flags))) { /* neither ipv4 or ipv6 -- what else? */
> skipForm = 1;
> newtPopWindow();
> + logMessage(DEBUGLVL, "in configureTCPIP(), detected network boot args, skipping form");
> }
Something's got to be done about this conditional. It well past the
point of being unwieldy.
- Chris
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
