diff options
| author | Alexandre Bard <Alexandre.Bard@netmodule.com> | 2019-10-02 12:12:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-02 20:22:25 +0100 |
| commit | fb427f4f5c90d10f85ddad160e78209ed2b8100d (patch) | |
| tree | fa3c8300028cb0893cfca59c9a0d1878d4120fce | |
| parent | e66afddf41f680158845d65efcd4506b89a55199 (diff) | |
| download | poky-fb427f4f5c90d10f85ddad160e78209ed2b8100d.tar.gz | |
systemd: Expose resolv-conf alternative only when resolved is built
When systemd is built without internal resolver, it does not make
sense to expose it as a resolv-conf alternative and can even break
images where this alternative would be chosen, because of an
invalid symlink.
(From OE-Core rev: 91efc50723229672b6e8187b69b183cba525f199)
Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd_243.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index eaa12ed107..b9097593f1 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb | |||
| @@ -637,7 +637,7 @@ python do_warn_musl() { | |||
| 637 | } | 637 | } |
| 638 | addtask warn_musl before do_configure | 638 | addtask warn_musl before do_configure |
| 639 | 639 | ||
| 640 | ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel resolv-conf" | 640 | ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" |
| 641 | 641 | ||
| 642 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" | 642 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" |
| 643 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" | 643 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" |