aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-03-11 19:42:07 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-03-11 19:42:07 +0100
commit919986e707f125da355e4b83c7d7635388e85a32 (patch)
tree64d5d75e983dd64c9de08a047f31dd016146c160
parent1bd9a7bcc58beaa0f5aa6029ec92d67777ce2e7e (diff)
Remove network config fragment deployed by upstream
Upstream YP/zeus unconditionally deploys a network config fragment for systemd-networkd. This breaks our CI builds as it races with connman and netboot. At least it does disturb the network enough for netboot to fail. We have a nicer solution for that in-tree that we will upstream. Until then, we remove the config file from our filesystems. Bug-AGL: SPEC-3233 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I9e8343e77af378c058702b13fe000a344e6a1ef9
-rw-r--r--meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend
new file mode 100644
index 000000000..6661eab6c
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend
@@ -0,0 +1,4 @@
+do_install_append() {
+ # Remove ethernet script deployed by upstream unconditionally (SPEC-3221)
+ rm -rf ${D}${systemd_unitdir}/network/80-wired.network || true
+} \ No newline at end of file