Skip to contentSkip to conversation

systemd: Expose resolv-conf alternative only when resolved is built

PATCH New Alexandre Bard 1 participant 1 message Oct 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-core/systemd/systemd_237.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_237.bb +1 -0
index a0e5d512e0..d3a6d52a73 100644
@@ -548,6 +548,7 @@ python __anonymous() {
 # TODO:
 # u-a for runlevel and telinit
 
+ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
 ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel resolv-conf"
 
 ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd"
Signature · 1 line
2.20.1