From 38e85b54b041e2c93292a8e24c0d290b9150e59f Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 12 Oct 2022 13:02:56 +0200 Subject: 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 Change-Id: Ic15fade35fd2c47b828e51692609d438225ef739 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28054 Tested-by: Jenkins Job builder account --- .../connman/connman/0001-disable-when-booting-over-nfs.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f129a6580..b3da12a55 100644 --- 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 -- cgit 1.2.3-korg