Exempt nfsroot and nbdroot from systemd-networkd

We need to exempt these in our wired configuration is using nbdroot or nfsroot.

Likewise we can relax the connman settings again.

Change-Id: I10fb9c97db1aba04941bf33f3e9d8a06a963cfac
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28406
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: 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 b3da12a..f129a65 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,11 +1,10 @@
 --- 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,8 @@
+@@ -7,6 +7,7 @@
  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

diff --git a/meta-agl-core/recipes-core/systemd/systemd/wired.network b/meta-agl-core/recipes-core/systemd/systemd/wired.network
index 3559b01..425610a 100644 (file)
--- a/meta-agl-core/recipes-core/systemd/systemd/wired.network
+++ b/meta-agl-core/recipes-core/systemd/systemd/wired.network
@@ -1,5 +1,8 @@
 [Match]
 Name=eth* en*
+KernelCommandLine=!nbdroot
+KernelCommandLine=!nfsroot
+KernelCommandLine=!ip
 
 [Network]
 DHCP=yes