diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-23 17:37:38 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 17:40:24 +0000 |
| commit | 3122da7cb2cbaf2f79c299acd5d2070caf07ec56 (patch) | |
| tree | 5b089ce9f1bef8d1903ebafce52052afd3e52f1d | |
| parent | bc5d5457ab2d7191db343cfcb2bf3a5c8cd24a93 (diff) | |
| download | openembedded-core-3122da7cb2cbaf2f79c299acd5d2070caf07ec56.tar.gz openembedded-core-3122da7cb2cbaf2f79c299acd5d2070caf07ec56.tar.bz2 openembedded-core-3122da7cb2cbaf2f79c299acd5d2070caf07ec56.zip | |
sysvinit: use update-alternatives for mountpoint and runlevel
* mountpoint and runlevel may be provided by busybox.
* Use update-alternatives to avoid conflict.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index 663e298e4a..d3e430c76a 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" -PR = "r5" +PR = "r6" RDEPENDS_${PN} = "${PN}-inittab" @@ -66,9 +66,11 @@ do_install () { ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd done mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${BPN} + mv ${D}${base_bindir}/mountpoint ${D}${base_bindir}/mountpoint.${BPN} mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN} mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN} mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN} + mv ${D}${base_sbindir}/runlevel ${D}${base_sbindir}/runlevel.${BPN} mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN} mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN} mv ${D}${bindir}/last ${D}${bindir}/last.${BPN} @@ -77,8 +79,10 @@ do_install () { } pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/mountpoint mountpoint mountpoint.${BPN} 200 update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200 update-alternatives --install ${base_sbindir}/reboot reboot reboot.${BPN} 200 + update-alternatives --install ${base_sbindir}/runlevel runlevel runlevel.${BPN} 200 update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${BPN} 200 update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${BPN} 200 update-alternatives --install ${bindir}/last last last.${BPN} 200 @@ -87,8 +91,10 @@ pkg_postinst_${PN} () { } pkg_prerm_${PN} () { + update-alternatives --remove mountpoint mountpoint.${BPN} update-alternatives --remove halt halt.${BPN} update-alternatives --remove reboot reboot.${BPN} + update-alternatives --remove runlevel runlevel.${BPN} update-alternatives --remove shutdown shutdown.${BPN} update-alternatives --remove poweroff poweroff.${BPN} update-alternatives --remove last last.${BPN} |