aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-10-12 13:02:56 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-11-21 12:28:17 +0000
commit38e85b54b041e2c93292a8e24c0d290b9150e59f (patch)
tree430493b3a03ea016288e42dd6a0cee54d70689ce
parent187d0edc968694e021fae17fc19d5f3f29d4ab09 (diff)
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
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch3
1 files changed, 2 insertions, 1 deletions
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