[oe] [PATCH 2/2] util-linux-ng: use u-a for /etc/default/mountall (collision with busybox-mountall)

[Martin Jansa]

---
 recipes/util-linux-ng/util-linux-ng.inc |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 7f4333b..031b80b 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -7,7 +7,7 @@ inherit autotools
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r9"
+INC_PR = "r10"
 
 # allows for a release candidate
 RC ?= ""
@@ -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}
@@ -269,3 +269,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}
+}
+
-- 
1.7.0