From 9fafca436000bb57ddd5c498f8a75ea7b274f6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 15 Mar 2016 21:36:24 +0000
Subject: Implement /usr merge

Do not create /bin, /sbin, /usr/sbin and /lib

Create symlinks
/bin      -> /usr/bin
/sbin     -> /usr/bin
/usr/sbin -> /usr/bin
/lib      -> /usr/lib

More info here:
https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
---
 create-fhs-dirs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/create-fhs-dirs b/create-fhs-dirs
index 96a4a78..5e7521a 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -32,20 +32,17 @@ group=root
 perms=0755
 
 dirs="
-bin
 boot
 dev
 etc
 etc/network
 home
-lib
 media
 mnt
 opt
 proc
 root
 run
-sbin
 srv
 sys
 tmp
@@ -58,7 +55,6 @@ usr/local/bin
 usr/local/lib
 usr/local/share
 usr/local/sbin
-usr/sbin
 usr/share
 usr/share/doc
 usr/share/info
@@ -91,6 +87,10 @@ while read link name; do
     ln -s "$link" "$target/$name"
 done <<EOF
 /proc/mounts /etc/mtab
+/usr/bin /bin
+/usr/bin /sbin
+/usr/bin /usr/sbin
+/usr/lib /lib
 EOF
 
 # Fix permissions and ownerships for some special cases.
-- 
cgit v1.2.1