From 147da8fe7458a38598845958cb358bb094eba57b Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Thu, 5 Jul 2018 11:57:19 +0300 Subject: util-linux.inc: add fallocate & unshare to alternatives These binaries can be provided by busybox triggering a conflict in do_rootfs so update-alternatives needs to know about them to properly create the symlinks. Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Ross Burton --- meta/recipes-core/util-linux/util-linux.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8d8f3962ff0..ed5c6187504 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -206,7 +206,7 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" -ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" +ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall fallocate unshare" ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -217,6 +217,8 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" -- cgit 1.2.3-korg