rpm/network: Use the IPv4 address if available

When the contextualization variables give us both IPv4 and IPv6 addresses, use both instead of expecting CONTEXT_FORCE_IPV4. (cherry picked from commit e100dcc14c)
9 years ago · c2316a74de
parent 80e0a44f6d
commit c2316a74de
1 changed files with 1 additions and 1 deletions
--- a/base_rpm.one/etc/one-context.d/10-network
+++ b/base_rpm.one/etc/one-context.d/10-network
@ -181,7 +181,7 @@ ONBOOT=yes
 NM_CONTROLLED=no
 TYPE=Ethernet
 EOT
-            [[ -z $IPV6 || -n $CONTEXT_FORCE_IPV4 ]] && gen_iface_conf
+            [[ -n $IP ]] && gen_iface_conf
            [[ -n $IPV6 ]] && gen_iface6_conf

        ) > /etc/sysconfig/network-scripts/ifcfg-${DEV}