From 09b7d4f2b1e5671387971d19f61fbebced44128b Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 18 May 2017 17:38:45 +0200
Subject: [PATCH] networkmanager: implement ethernet configuration

https://jira.digi.com/browse/DEL-4289

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../networkmanager/nm.eth0.dhcp               |  7 ++++
 .../networkmanager/nm.eth0.static             |  9 +++++
 .../networkmanager/nm.eth1.dhcp               |  7 ++++
 .../networkmanager/nm.eth1.static             |  9 +++++
 .../networkmanager_1.0.12.bbappend            | 37 +++++++++++++++++++
 5 files changed, 69 insertions(+)
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.dhcp
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.static
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.dhcp
 create mode 100644 meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.static

diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.dhcp b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.dhcp
new file mode 100644
index 000000000..bf463888d
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.dhcp
@@ -0,0 +1,7 @@
+[connection]
+id=eth0
+type=ethernet
+interface-name=eth0
+
+[ipv4]
+method=auto
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.static b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.static
new file mode 100644
index 000000000..0b776cc0d
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth0.static
@@ -0,0 +1,9 @@
+[connection]
+id=eth0
+type=ethernet
+interface-name=eth0
+
+[ipv4]
+address1=##ETH0_STATIC_CIDR##,##ETH0_STATIC_GATEWAY##
+dns=##ETH0_STATIC_DNS##;
+method=manual
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.dhcp b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.dhcp
new file mode 100644
index 000000000..c7f11b9a1
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.dhcp
@@ -0,0 +1,7 @@
+[connection]
+id=eth1
+type=ethernet
+interface-name=eth1
+
+[ipv4]
+method=auto
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.static b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.static
new file mode 100644
index 000000000..deeac0897
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.eth1.static
@@ -0,0 +1,9 @@
+[connection]
+id=eth1
+type=ethernet
+interface-name=eth1
+
+[ipv4]
+address1=##ETH1_STATIC_CIDR##,##ETH1_STATIC_GATEWAY##
+dns=##ETH1_STATIC_DNS##;
+method=manual
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
index f24de6b0d..439f9215a 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.0.12.bbappend
@@ -5,17 +5,54 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 SRC_URI += " \
     file://NetworkManager.conf \
     file://networkmanager-init \
+    file://nm.eth0.dhcp \
+    file://nm.eth0.static \
+    file://nm.eth1.dhcp \
+    file://nm.eth1.static \
 "
 
 PACKAGECONFIG_remove = "dnsmasq netconfig"
 PACKAGECONFIG_append = " concheck modemmanager ppp"
 
+#
+# NetworkManager only accepts IP addresses in CIDR format
+#
+def ipaddr_to_cidr(iface, d):
+    ipaddr = d.getVar('%s_STATIC_IP' % iface.upper(), True)
+    netmask = d.getVar('%s_STATIC_NETMASK' % iface.upper(), True)
+    binary_str = ''
+    for byte in netmask.split('.'):
+        binary_str += bin(int(byte))[2:].zfill(8)
+    return ipaddr + '/' + str(len(binary_str.rstrip('0')))
+
+ETH0_STATIC_CIDR = "${@ipaddr_to_cidr('eth0', d)}"
+ETH1_STATIC_CIDR = "${@ipaddr_to_cidr('eth1', d)}"
+
 inherit update-rc.d
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/NetworkManager
 	install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
 	install -m 0755 ${WORKDIR}/networkmanager-init ${D}${sysconfdir}/init.d/networkmanager
+
+	#
+	# Connections config files
+	#
+	install -d ${D}${sysconfdir}/NetworkManager/system-connections/
+
+	# Ethernet
+	install -m 0600 ${WORKDIR}/nm.eth0.${ETH0_MODE} ${D}${sysconfdir}/NetworkManager/system-connections/nm.eth0
+	sed -i  -e "s,##ETH0_STATIC_CIDR##,${ETH0_STATIC_CIDR},g" \
+		-e "s,##ETH0_STATIC_GATEWAY##,${ETH0_STATIC_GATEWAY},g" \
+		-e "s,##ETH0_STATIC_DNS##,${ETH0_STATIC_DNS},g" \
+		${D}${sysconfdir}/NetworkManager/system-connections/nm.eth0
+
+	# Ethernet (second interface)
+	install -m 0600 ${WORKDIR}/nm.eth1.${ETH1_MODE} ${D}${sysconfdir}/NetworkManager/system-connections/nm.eth1
+	sed -i  -e "s,##ETH1_STATIC_CIDR##,${ETH1_STATIC_CIDR},g" \
+		-e "s,##ETH1_STATIC_GATEWAY##,${ETH1_STATIC_GATEWAY},g" \
+		-e "s,##ETH1_STATIC_DNS##,${ETH1_STATIC_DNS},g" \
+		${D}${sysconfdir}/NetworkManager/system-connections/nm.eth1
 }
 
 # NetworkManager needs to be started after DBUS