aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-03-05 12:35:48 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-03-07 12:42:35 +0100
commit1ad4ccb8e6b5b684175bea53f8a6de22393899ac (patch)
tree9e995eaf32aaa50260fcf47f64cdfcd9cdd08817
parent289532f00787c2e3181628beb452ca83eabd2c11 (diff)
downloadopenembedded-1ad4ccb8e6b5b684175bea53f8a6de22393899ac.tar.gz
util-linux-ng: use u-a for /etc/default/mountall (collision with busybox-mountall)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/util-linux-ng/util-linux-ng.inc11
1 files changed, 9 insertions, 2 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 43b31efce4..bd0c300c25 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -46,7 +46,7 @@ FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}"
FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}"
PACKAGES =+ "${PN}-mountall"
-FILES_${PN}-mountall = "${sysconfdir}/default/mountall"
+FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
RREPLACES_${PN}-mountall = "busybox-mountall"
RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile "
@@ -152,7 +152,7 @@ do_install () {
done
install -d ${D}${sysconfdir}/default/
- echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
+ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall.${PN}
rm ${D}${sbindir}/swapoff -f
ln -sf ${base_sbindir}/swapon.${PN} ${D}${base_sbindir}/swapoff.${PN}
@@ -262,3 +262,10 @@ pkg_prerm_util-linux-ng-readprofile () {
update-alternatives --remove readprofile readprofile.${PN} 100
}
+pkg_postinst_util-linux-ng-mountall () {
+ update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 100
+}
+pkg_prerm_util-linux-ng-mountall () {
+ update-alternatives --remove default_mountall mountall.${PN}
+}
+