X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-core%2Fsystemd%2Fsystemd_aglcore.inc;h=9681329be2f18d24e1a5664cf74555f7791dd4c5;hb=4f764134d2f307c1eb63cea7cc0950a7873a2e43;hp=a61497ec38169e4b63fdb796d85b449f1f5dd1de;hpb=ddc327473c7ac31100c16c9fb76ec5c3f7d1fa4a;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
index a61497ec3..9681329be 100644
--- a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
+++ b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc
@@ -2,29 +2,35 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:"
 
 SRC_URI += "\
     file://e2fsck.conf \
-    ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \
+    file://wait-disable.conf \
+    file://wired.network \
 "
 
-# enable networkd/resolved support
+# Enable networkd/resolved support if using systemd for network management
 PACKAGECONFIG:append = " \
    ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \
    iptc \
 "
 
+# SPEC-737: connmand also has a NTP client which races with systemd-timesyncd
+PACKAGECONFIG:remove = "timesyncd"
+
+# Enable systemd-coredump when agl-devel is set on
+PACKAGECONFIG:append:agl-devel = " coredump"
+
 do_install:append() {
     # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
     install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf
 
-    if ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','true','false',d)}; then
+    if [ "${VIRTUAL-RUNTIME_net_manager}" = "systemd" ]; then
        # Install DHCP configuration for Ethernet adapters
        install -m 644 ${WORKDIR}/wired.network ${D}${sysconfdir}/systemd/network
+    elif [ "${VIRTUAL-RUNTIME_net_manager}" = "connman" ]; then
+       # Disable systemd-networkd-wait-online by default
+       install -d ${D}${systemd_system_unitdir}/systemd-networkd-wait-online.service.d
+       install -m 0644 ${WORKDIR}/wait-disable.conf ${D}${systemd_system_unitdir}/systemd-networkd-wait-online.service.d/
     fi
 }
 
 FILES:${PN} += "${sysconfdir}/e2fsck.conf "
 
-# SPEC-737: connmand also has a NTP client which races with systemd-timesyncd
-PACKAGECONFIG:remove = "timesyncd"
-
-# Enable systemd-coredump when agl-devel is set on
-PACKAGECONFIG:append:agl-devel = " coredump"