Exempt also nbd.server in connman service

This adds a check for the nbd.server kernel commandline and prevents
connman service from being started.

If nbdroot is set and the networkinterface is resetup, then the rootfs will fail.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ic15fade35fd2c47b828e51692609d438225ef739
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28054
Tested-by: Jenkins Job builder account

diff --git a/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch
index f129a65..b3da12a 100644 (file)
--- a/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch
+++ b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch
@@ -1,10 +1,11 @@
 --- connman-1.36.orig/src/connman.service.in   2019-02-18 18:02:07.034947373 -0500
 +++ connman-1.36/src/connman.service.in        2019-02-18 18:07:24.689959219 -0500
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,8 @@
  Before=network.target multi-user.target shutdown.target
  Wants=network.target
  Conflicts=systemd-resolved.service
 +ConditionKernelCommandLine=!root=/dev/nfs
++ConditionKernelCommandLine=!nbd.server
  
  [Service]
  Type=dbus