diff options
author | Stefan Schmidt <stefan.schmidt@huawei.com> | 2021-03-04 20:35:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-28 22:31:55 +0100 |
commit | 9b9bcb844399310905c6e635390fc4c46f1dce01 (patch) | |
tree | c8aae66185af84cb772d23318df2f8965b928514 /meta | |
parent | 03381dda4b9f2abc16ebf71766f239ebce0c92b8 (diff) | |
download | poky-9b9bcb844399310905c6e635390fc4c46f1dce01.tar.gz |
systemd-conf: do not ask for DHCP if configured on kernel command line
In cases where we configure the IP address and more on the kernel
command line with ip= we should not ask for DHCP with systemd-networkd
later on. We have such a setup with our runqemu script.
With this match in place we can also deploy this unit on qemu systems.
(From OE-Core rev: a321345bee919ff16f6041ded26776da890c395d)
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8c4981e740c0e630200dbc77c9e3dfd3e43b790b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf/wired.network | 1 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_246.9.bb | 3 |
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 dcf3534596..06d00ea1ba 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] |
2 | Name=en* eth* | 2 | Name=en* eth* |
3 | KernelCommandLine=!nfsroot | 3 | KernelCommandLine=!nfsroot |
4 | KernelCommandLine=!ip | ||
4 | 5 | ||
5 | [Network] | 6 | [Network] |
6 | DHCP=yes | 7 | DHCP=yes |
diff --git a/meta/recipes-core/systemd/systemd-conf_246.9.bb b/meta/recipes-core/systemd/systemd-conf_246.9.bb index d9ec023bfd..9b797a91f4 100644 --- a/meta/recipes-core/systemd/systemd-conf_246.9.bb +++ b/meta/recipes-core/systemd/systemd-conf_246.9.bb | |||
@@ -23,9 +23,6 @@ do_install() { | |||
23 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 | 23 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 |
24 | do_install_append_qemuall() { | 24 | do_install_append_qemuall() { |
25 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf | 25 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf |
26 | |||
27 | # Do not install wired.network for qemu bsps | ||
28 | rm -rf ${D}${systemd_unitdir}/network | ||
29 | } | 26 | } |
30 | 27 | ||
31 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 28 | PACKAGE_ARCH = "${MACHINE_ARCH}" |