connman: amend patch file with comments

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>

3 files changed, 34 insertions, 12 deletions

diff --git a/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch b/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch
new file mode 100644
index 0000000..57262b9
--- /dev/null
+++ b/recipes-connectivity/connman/connman/0001-connman.service.in-don-t-start-if-nfs-boot.patch
@@ -0,0 +1,33 @@
+From 2f92fd3d8c5e22d77c445869675a10aa2e0c15ea Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Fri, 30 Dec 2016 13:43:52 +0100
+Subject: [PATCH 1/3] connman.service.in: don't start if nfs boot
+
+connman reconnects its NIC's. If doing a NFS boot the rootfs
+connection drops and the boot will fail.
+As a simple workaround do not manage the network with connman
+at all.
+Alternatively one could black list the network interface used
+for NFS in /etc/connman/main.conf.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ src/connman.service.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/connman.service.in b/src/connman.service.in
+index 57eaaf9..a81f29a 100644
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -6,6 +6,8 @@ RequiresMountsFor=@localstatedir@/lib/connman
+ After=dbus.service network-pre.target systemd-sysusers.service
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
++# only if not NFS mount, connman will disconnect your rootfs otherwise!
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
+-- 
+2.6.6
+
diff --git a/recipes-connectivity/connman/connman/dont_start_connman_on_nfsboot.patch b/recipes-connectivity/connman/connman/dont_start_connman_on_nfsboot.patch
deleted file mode 100644
index 8aa86aa..0000000
--- a/recipes-connectivity/connman/connman/dont_start_connman_on_nfsboot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- connman-1.31/src/connman.service.in~	2016-01-24 13:16:06.000000000 +0100
-+++ connman-1.31/src/connman.service.in	2016-01-24 13:43:09.650266502 +0100
-@@ -6,6 +6,8 @@
- After=dbus.service network-pre.target systemd-sysusers.service
- Before=network.target multi-user.target shutdown.target
- Wants=network.target
-+# only if not NFS mount, connman will disconnect your rootfs otherwise!
-+ConditionKernelCommandLine=!root=/dev/nfs
- 
- [Service]
- Type=dbus
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
index 60edc3b..0ca9cb8 100644
--- a/recipes-connectivity/connman/connman_%.bbappend
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/connman:"
 
 SRC_URI += " \
-    file://dont_start_connman_on_nfsboot.patch \
+    file://0001-connman.service.in-don-t-start-if-nfs-boot.patch \
     file://main.conf \
 "