diff options
| author | Anuj Mittal <anuj.mittal@intel.com> | 2018-10-11 16:41:11 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-12 08:44:05 +0100 |
| commit | a27a197ad4bb32fa93aa95e685e9e70ffe755811 (patch) | |
| tree | 494b2b26da9798d0cfbdebc69ff25c8e7ba8cf42 /meta/recipes-core | |
| parent | 239a4fc1db530f201e1f7069b2045135699a85a7 (diff) | |
| download | openembedded-core-a27a197ad4bb32fa93aa95e685e9e70ffe755811.tar.gz openembedded-core-a27a197ad4bb32fa93aa95e685e9e70ffe755811.tar.bz2 openembedded-core-a27a197ad4bb32fa93aa95e685e9e70ffe755811.zip | |
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 <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_239.bb | 7 |
1 files changed, 5 insertions, 2 deletions
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*\<myhostname\>//' \ -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ |