aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-core
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-01-19 23:47:09 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-01-22 18:16:05 +0000
commit0c89b4b04d67eacbdcf5c128873b82e123978419 (patch)
treed477f2a8c352fe618bf3f5c0c710a251fffc29ab /meta-agl-core
parent285de23dc83e438486d1a1625199870e6bffff71 (diff)
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
Diffstat (limited to 'meta-agl-core')
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch3
-rw-r--r--meta-agl-core/recipes-core/systemd/systemd/wired.network3
2 files changed, 4 insertions, 2 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 b3da12a55..f129a6580 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,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 3559b0155..425610a3f 100644
--- 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