From a27a197ad4bb32fa93aa95e685e9e70ffe755811 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 11 Oct 2018 16:41:11 +0800 Subject: systemd: add ALTERNATIVE for reboot reboot is provided by busybox too. Add ALTERNATIVE to ensure that there are no conflicts when both are installed. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_239.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 194efb5b94..7ed932141d 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb @@ -447,7 +447,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${base_sbindir}/runlevel \ ${base_sbindir}/telinit \ ${base_sbindir}/resolvconf \ - ${base_sbindir}/reboot \ + ${base_sbindir}/reboot.systemd \ ${base_sbindir}/init \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ @@ -556,12 +556,15 @@ python __anonymous() { d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } -ALTERNATIVE_${PN} = "resolv-conf" +ALTERNATIVE_${PN} = "resolv-conf reboot" ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" ALTERNATIVE_PRIORITY[resolv-conf] ?= "50" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_PRIORITY[reboot] = "100" + pkg_postinst_${PN} () { sed -e '/^hosts:/s/\s*\//' \ -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ -- cgit 1.2.3-korg