summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd-conf/wired.network1
-rw-r--r--meta/recipes-core/systemd/systemd-conf_247.3.bb3
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf/wired.network b/meta/recipes-core/systemd/systemd-conf/wired.network
index 09367edb10..e7b69970d6 100644
--- a/meta/recipes-core/systemd/systemd-conf/wired.network
+++ b/meta/recipes-core/systemd/systemd-conf/wired.network
@@ -1,6 +1,7 @@
1[Match] 1[Match]
2Type=ether 2Type=ether
3KernelCommandLine=!nfsroot 3KernelCommandLine=!nfsroot
4KernelCommandLine=!ip
4 5
5[Network] 6[Network]
6DHCP=yes 7DHCP=yes
diff --git a/meta/recipes-core/systemd/systemd-conf_247.3.bb b/meta/recipes-core/systemd/systemd-conf_247.3.bb
index 944b56ff82..ea35e83f4f 100644
--- a/meta/recipes-core/systemd/systemd-conf_247.3.bb
+++ b/meta/recipes-core/systemd/systemd-conf_247.3.bb
@@ -29,9 +29,6 @@ do_install() {
29# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 29# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
30do_install_append_qemuall() { 30do_install_append_qemuall() {
31 install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf 31 install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
32
33 # Do not install wired.network for qemu bsps
34 rm -rf ${D}${systemd_unitdir}/network
35} 32}
36 33
37PACKAGE_ARCH = "${MACHINE_ARCH}" 34PACKAGE_ARCH = "${MACHINE_ARCH}"