From 1829146518deb19a8abb0081ca7d3150c5b8e5b2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 26 Jul 2017 15:53:22 +0200 Subject: connman: forward port patch Version update in oe-core requires patch rebase. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- .../0001-connman.service.in-don-t-start-if-nfs-boot.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-connectivity') 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 index 57262b9..65da8ff 100644 --- 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 @@ -1,7 +1,7 @@ -From 2f92fd3d8c5e22d77c445869675a10aa2e0c15ea Mon Sep 17 00:00:00 2001 +From 390493e5aab8a6c859a9d14020b6b9cd09bf6f57 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 30 Dec 2016 13:43:52 +0100 -Subject: [PATCH 1/3] connman.service.in: don't start if nfs boot +Subject: [PATCH] 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. @@ -16,18 +16,18 @@ Signed-off-by: Max Krummenacher 1 file changed, 2 insertions(+) diff --git a/src/connman.service.in b/src/connman.service.in -index 57eaaf9..a81f29a 100644 +index dab48bc..72c0c91 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 +@@ -7,6 +7,8 @@ After=dbus.service network-pre.target systemd-sysusers.service Before=network.target multi-user.target shutdown.target Wants=network.target + Conflicts=systemd-resolved.service +# only if not NFS mount, connman will disconnect your rootfs otherwise! +ConditionKernelCommandLine=!root=/dev/nfs [Service] Type=dbus -- -2.6.6 +2.12.0 -- cgit v1.2.3