From c2316a74debd9ef0f1633ddbf20584b8c06ad3d3 Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Fri, 15 Apr 2016 15:09:46 +0200
Subject: [PATCH] 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 e100dcc14c0976080ef9097c203f1bccad7cb2ea)
---
 base_rpm.one/etc/one-context.d/10-network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base_rpm.one/etc/one-context.d/10-network b/base_rpm.one/etc/one-context.d/10-network
index 2a2d36c..0558c82 100755
--- 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}