diff options
| author | Stefan Schmidt <stefan.schmidt@huawei.com> | 2021-03-18 14:22:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-28 22:31:46 +0100 |
| commit | f3be5ea3c235b9335969b6b36de6e8be41352994 (patch) | |
| tree | 89717e781e8f348b44a6b73d9bf8fdd8423f1c2d /meta/recipes-core/systemd/systemd-conf/wired.network | |
| parent | 64a6145cacbaf2aa70bc832efbd663eb15ca5261 (diff) | |
| download | poky-f3be5ea3c235b9335969b6b36de6e8be41352994.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: c88bb3db92d0650a560d7cbc1f0f42ae8faf15e1)
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: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-conf/wired.network')
| -rw-r--r-- | meta/recipes-core/systemd/systemd-conf/wired.network | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf/wired.network b/meta/recipes-core/systemd/systemd-conf/wired.network index ff807ba31f..34c20fcb24 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 |