diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-06-02 10:55:30 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-04 09:09:42 +0100 |
commit | a972e4015b4867dc65f88356feccae5095b96cb0 (patch) | |
tree | b2e5efacaecc30bda2c8d4f33381a6c86da969d2 | |
parent | 0a2382cdca2acaa9df008ff66018bbc3fa00bb05 (diff) | |
download | poky-a972e4015b4867dc65f88356feccae5095b96cb0.tar.gz |
systemd-conf: configure wired network with dhcp
Add a configure file for systemd.networkd to configure wired network
interfaces with dhcp. It works with common network interfaces such eth0
and eno1. And do not install it for qemu bsps.
Refer to
https://github.com/YoeDistro/meta-yoe/tree/master/recipes-core/systemd
[YOCTO #13057]
(From OE-Core rev: d87efd14ce0471135c0aa7fd7b5da2808acb9c76)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf/wired.network | 9 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_242.bb | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf/wired.network b/meta/recipes-core/systemd/systemd-conf/wired.network new file mode 100644 index 0000000000..253aee9382 --- /dev/null +++ b/meta/recipes-core/systemd/systemd-conf/wired.network | |||
@@ -0,0 +1,9 @@ | |||
1 | [Match] | ||
2 | Name=en* eth* | ||
3 | |||
4 | [Network] | ||
5 | DHCP=yes | ||
6 | |||
7 | [DHCP] | ||
8 | RouteMetric=10 | ||
9 | ClientIdentifier=mac | ||
diff --git a/meta/recipes-core/systemd/systemd-conf_242.bb b/meta/recipes-core/systemd/systemd-conf_242.bb index 96beea53a7..d9ec023bfd 100644 --- a/meta/recipes-core/systemd/systemd-conf_242.bb +++ b/meta/recipes-core/systemd/systemd-conf_242.bb | |||
@@ -10,17 +10,22 @@ SRC_URI = "\ | |||
10 | file://logind.conf \ | 10 | file://logind.conf \ |
11 | file://system.conf \ | 11 | file://system.conf \ |
12 | file://system.conf-qemuall \ | 12 | file://system.conf-qemuall \ |
13 | file://wired.network \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | do_install() { | 16 | do_install() { |
16 | install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf | 17 | install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf |
17 | install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf | 18 | install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf |
18 | install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf | 19 | install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf |
20 | install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network | ||
19 | } | 21 | } |
20 | 22 | ||
21 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 | 23 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 |
22 | do_install_append_qemuall() { | 24 | do_install_append_qemuall() { |
23 | 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 | ||
24 | } | 29 | } |
25 | 30 | ||
26 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 31 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -29,4 +34,5 @@ FILES_${PN} = "\ | |||
29 | ${systemd_unitdir}/journald.conf.d/ \ | 34 | ${systemd_unitdir}/journald.conf.d/ \ |
30 | ${systemd_unitdir}/logind.conf.d/ \ | 35 | ${systemd_unitdir}/logind.conf.d/ \ |
31 | ${systemd_unitdir}/system.conf.d/ \ | 36 | ${systemd_unitdir}/system.conf.d/ \ |
37 | ${systemd_unitdir}/network/ \ | ||
32 | " | 38 | " |