428ac6fcc4
Starting with version 256 [0], systemd warns when /usr/bin and /usr/sbin are different directories; in the future, it may even refuse to boot in such a situation. Add support for merged-bin, not unlike the support we have for merged-usr; we also make merged-bin a sub-case of merged-usr (i.e. it is not possible to do merged-bin without merged-usr). [0] https://github.com/systemd/systemd/blob/v256/NEWS#L265 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Acked-by: Arnout Vandecappelle <arnout@mind.be> Acked-by: TIAN Yuanhao <tianyuanhao3@163.com> Cc: Edgar Bonet <bonet@grenoble.cnrs.fr> Signed-off-by: Romain Naour <romain.naour@smile.fr>