mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-07 15:09:50 +00:00
Code Issues Projects Releases Wiki Activity

systemd: add ALTERNATIVE for reboot

Browse Source 
reboot is provided by busybox too. Add ALTERNATIVE to ensure that there
are no conflicts when both are installed.

(From OE-Core rev: a27a197ad4bb32fa93aa95e685e9e70ffe755811)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anuj Mittal
2018-10-11 16:41:11 +08:00
committed by Richard Purdie
parent ef4a417ab0
commit 8421aede4f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd_239.bb
+5 -2
View File
@@ -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*\<myhostname\>//' \
-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \