From e037c33b4a10a0c944667467e11a8ad762145125 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Wed, 8 Jun 2016 15:45:10 +0200
Subject: [PATCH] gh-26: skip conf for interfaces without IP

---
 base_arch/etc/one-context.d/10-network    | 6 ++----
 base_deb.one/etc/one-context.d/10-network | 6 ++----
 base_rpm.one/etc/one-context.d/10-network | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/base_arch/etc/one-context.d/10-network b/base_arch/etc/one-context.d/10-network
index 95ae091..0613f78 100755
--- a/base_arch/etc/one-context.d/10-network
+++ b/base_arch/etc/one-context.d/10-network
@@ -114,10 +114,6 @@ get_gateway6() {
 get_ip() {
     ip=$(get_iface_var "IP")
 
-    if [ -z "$ip" ]; then
-        ip=$(mac2ip $MAC)
-    fi
-
     echo $ip
 }
 
@@ -212,6 +208,8 @@ gen_network_configuration()
         GATEWAY6=$(get_gateway6)
         CONTEXT_FORCE_IPV4=$(get_iface_var "CONTEXT_FORCE_IPV4")
 
+        [ -z "${IP}${IPV6}" ] && continue
+
         (
             cat <<EOT
 [Match]
diff --git a/base_deb.one/etc/one-context.d/10-network b/base_deb.one/etc/one-context.d/10-network
index 1350bdc..a8c7f71 100755
--- a/base_deb.one/etc/one-context.d/10-network
+++ b/base_deb.one/etc/one-context.d/10-network
@@ -93,10 +93,6 @@ get_gateway6() {
 get_ip() {
     ip=$(get_iface_var "IP")
 
-    if [ -z "$ip" ]; then
-        ip=$(mac2ip $MAC)
-    fi
-
     echo $ip
 }
 
@@ -226,6 +222,8 @@ EOT
         GATEWAY6=$(get_gateway6)
         CONTEXT_FORCE_IPV4=$(get_iface_var "CONTEXT_FORCE_IPV4")
 
+        [ -z "${IP}${IPV6}" ] && continue
+
         echo "auto $DEV"
 
         [[ -z $IPV6 || -n $CONTEXT_FORCE_IPV4 ]] && gen_iface_conf
diff --git a/base_rpm.one/etc/one-context.d/10-network b/base_rpm.one/etc/one-context.d/10-network
index 061f7ed..7e72544 100755
--- a/base_rpm.one/etc/one-context.d/10-network
+++ b/base_rpm.one/etc/one-context.d/10-network
@@ -93,10 +93,6 @@ get_gateway6() {
 get_ip() {
     ip=$(get_iface_var "IP")
 
-    if [ -z "$ip" ]; then
-        ip=$(mac2ip $MAC)
-    fi
-
     echo $ip
 }
 
@@ -181,6 +177,8 @@ gen_network_configuration()
         GATEWAY6=$(get_gateway6)
         CONTEXT_FORCE_IPV4=$(get_iface_var "CONTEXT_FORCE_IPV4")
 
+        [ -z "${IP}${IPV6}" ] && continue
+
         (
             cat <<EOT
 DEVICE=$DEV